DawnMagnet/tldr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adds more examples for git-rebase

Browse Source
This commit is contained in:
Seth Woodworth
2015-12-30 12:36:58 -05:00
parent a0f62e582a
commit 9c70b75220
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pages/common/git-rebase.md
View File

@@ -2,6 +2,18 @@
> Apply local commits on top of another branch's history > Apply local commits on top of another branch's history
- Rebase your local branch with the latest changes in master - Rebase your local branch interactively with the latest changes in local master
`git rebase -i master` (Then follow the directions in the terminal for merge conflicts) `git rebase -i master`
- Rebase your local branch interactively with the latest changes from upstream
`git fetch origin; git rebase -i origin/master`
- Handling an active rebase merge failure, after editing conflicting file(s)
`git rebase --continue`
- Abort a rebase in-progress
`git rebase --abort`