lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-04-22 09:42:07 +02:00
Code Activity

git-rebase: Add example with --skip option

Browse source
This commit is contained in:
Peter Nguyen 2019-07-07 11:01:27 +02:00 • committed by Starbeamrainbowlabs
parent e55edff06d
commit df4bae9a52
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pages/common/git-rebase.md
View file

@ -16,6 +16,10 @@
`git rebase --continue` `git rebase --continue`
- Continue a rebase that was paused due to merge conflicts, by skipping the conflicted commit:
`git rebase --skip`
- Abort a rebase in progress (e.g. if it is interrupted by a merge conflict): - Abort a rebase in progress (e.g. if it is interrupted by a merge conflict):
`git rebase --abort` `git rebase --abort`