logburn/git-utilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated README.md

Browse Source
This commit is contained in:
rkiel
2015-05-31 16:13:04 -04:00
parent 1a984b5f41
commit ca44e476ab
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -41,14 +41,12 @@ For example, a new branch will be created called `rkiel-master-my-new-feature`
#### Rebase
Use the `rebase` subcommand pull down any changes from the standard branch and rebase them with you changes.
Use the `rebase` subcommand to pull down any changes from the standard branch and then rebase with your feature branch changes.
```
feature rebase
```
For example, the `master` branch is pulled down and then rebased into the feature branch.
#### Merge
Use the `merge` subcommand to merge your feature branch changes to the standard branch.
@@ -57,16 +55,12 @@ Use the `merge` subcommand to merge your feature branch changes to the standard
feature merge
```
For example, the `master` branch is pulled down and then your feature branch is merged.
You can also override the default standard branch by specifying another branch.
```
feature merge integration
```
For example, the `integration` branch is pulled down and then your feature branch is merged.
#### End
Use the `end` subcommand to close out the feature.