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`