ashley/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2024-11-02 03:17:58 +01:00
Code 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
Show stats 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
- 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`