git-rebase: Add example with --skip option

2019-07-07 11:01:27 +02:00 · 2019-07-07 11:01:27 +02:00 · df4bae9a52
parent e55edff06d
commit df4bae9a52
1 changed files with 4 additions and 0 deletions
--- a/pages/common/git-rebase.md
+++ b/pages/common/git-rebase.md
@ -16,6 +16,10 @@

 `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):

 `git rebase --abort`