From 9c70b752201cee2fcd1cee5dee0443567b987b4e Mon Sep 17 00:00:00 2001 From: Seth Woodworth Date: Wed, 30 Dec 2015 12:36:58 -0500 Subject: [PATCH] adds more examples for git-rebase --- pages/common/git-rebase.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pages/common/git-rebase.md b/pages/common/git-rebase.md index 93ff2ae56..df67a006c 100644 --- a/pages/common/git-rebase.md +++ b/pages/common/git-rebase.md @@ -2,6 +2,18 @@ > Apply local commits on top of another branch's history -- Rebase your local branch with the latest changes in master +- Rebase your local branch interactively with the latest changes in local master -`git rebase -i master` (Then follow the directions in the terminal for merge conflicts) +`git rebase -i master` + +- 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) + +`git rebase --continue` + +- Abort a rebase in-progress + +`git rebase --abort`