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

Formatted git pages

Browse Source
This commit is contained in:
Ruben Vereecken
2016-01-21 13:08:45 +01:00
parent d00c14960d
commit d72dea7931
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,19 +1,19 @@
# git rebase
> Apply local commits on top of another branch's history
> Apply local commits on top of another branch's history.
- Rebase your local branch interactively with the latest changes in local master
- Rebase your local branch interactively with the latest changes in local master:
`git rebase -i master`
- Rebase your local branch interactively with the latest changes from upstream
- 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)
- Handle an active rebase merge failure, after editing conflicting file(s):
`git rebase --continue`
- Abort a rebase in-progress
- Abort a rebase in-progress:
`git rebase --abort`