From df4bae9a5290a63aa5ee044a6f5067ce6c7fd7cd Mon Sep 17 00:00:00 2001
From: Peter Nguyen <peter@mictis.com>
Date: Sun, 7 Jul 2019 11:01:27 +0200
Subject: [PATCH] git-rebase: Add example with --skip option

---
 pages/common/git-rebase.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/common/git-rebase.md b/pages/common/git-rebase.md
index 7193b3209..1f43afe21 100644
--- 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`