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:17:39 -04:00
parent ca44e476ab
commit 26bf68b896
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -42,11 +42,15 @@ For example, a new branch will be created called `rkiel-master-my-new-feature`
#### Rebase #### Rebase
Use the `rebase` subcommand to pull down any changes from the standard branch and then rebase with your feature branch changes. Use the `rebase` subcommand to pull down any changes from the standard branch and then rebase with your feature branch changes.
In addition, a backup copy of your feature changes will be pushed out to `origin`.
This backup should not be used to collaborate with others. It is just a personal backup and will be deleted and recreated with each `rebase`.
``` ```
feature rebase feature rebase
``` ```
For example, `rkiel-master-my-new-feature` will be pushed out to `origin`.
#### Merge #### Merge
Use the `merge` subcommand to merge your feature branch changes to the standard branch. Use the `merge` subcommand to merge your feature branch changes to the standard branch.