Skip to content

Commit 2008bda

Browse files
committed
misc
1 parent e44ef74 commit 2008bda

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![Dependencies Status](https://david-dm.org/logerfo/gitflow-action/dev-status.svg)](https://david-dm.org/logerfo/gitflow-action?type=dev)
22

33
# Gitflow Action
4-
This action will automatically merge your master branch into your dev branch and your release branch into your master branch through the creation of pull requests that will be automatically merged, if possible.
4+
This action will automatically merge your `master` branch into `dev` and `release` into `master` through the creation of pull requests that will be automatically merged, if possible.
55
Those pull requests will be identified by a label named `gitflow` as default.
66

77
## Setting up
@@ -11,8 +11,8 @@ Create a file named `.github/workflows/gitflow.yml`.
1111
```yml
1212
name: Gitflow
1313
on:
14-
- push # To create pull requests
15-
- pull_request # To merge pull requests if not possible during the push run
14+
- push # To create pull requests.
15+
- pull_request # To merge pull requests if not possible during the push run. Remove if `auto-merge` is `false`.
1616

1717
jobs:
1818
build:

action.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: gitflow-action
2-
description: Automatically creates and merges pull requests from master to dev and from release to master.
2+
description: Automatically creates and merges pull requests from `master` to `dev` and from `release` to `master`.
33
author: Bruno Logerfo
44

55
branding:
@@ -8,22 +8,22 @@ branding:
88

99
inputs:
1010
github-token:
11-
description: The GITHUB_TOKEN secret
11+
description: The `GITHUB_TOKEN` secret.
1212
required: true
1313
release:
14-
description: The release branch
14+
description: The `release` branch.
1515
default: release
1616
dev:
17-
description: The dev branch
17+
description: The `dev` branch.
1818
default: dev
1919
master:
20-
description: The master branch
20+
description: The `master` branch.
2121
default: master
2222
label:
23-
description: The pull request label
23+
description: The pull request label.
2424
default: gitflow
2525
auto-merge:
26-
description: If true, will try to automatically merge the pull requests
26+
description: If `true`, will try to automatically merge the pull requests.
2727
default: true
2828

2929
runs:

0 commit comments

Comments
 (0)