X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=4a7e67a4d2241a82a564734d64789e6ee13c8330;hb=0dec30b9788b12fdae5d5b69fc366a28bb688d80;hp=f037d1280eb629339d82bb1eabf0ede7a1e25708;hpb=2cf3be1d31b322cf45640f3019a32d19a8a9b6f8;p=git.git diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f037d128..4a7e67a4 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -3,7 +3,7 @@ git-rebase(1) NAME ---- -git-rebase - Rebase local commits to new upstream head. +git-rebase - Rebase local commits to new upstream head SYNOPSIS -------- @@ -25,7 +25,7 @@ Assume the following history exists and the current branch is "topic": / D---E---F---G master -From this point, the result of the following commands: +From this point, the result of either of the following commands: git-rebase master git-rebase master topic @@ -36,7 +36,7 @@ would be: / D---E---F---G master -While, starting from the same point, the result of the following +While, starting from the same point, the result of either of the following commands: git-rebase --onto master~1 master @@ -48,6 +48,18 @@ would be: / D---E---F---G master +In case of conflict, git-rebase will stop at the first problematic commit +and leave conflict markers in the tree. After resolving the conflict manually +and updating the index with the desired resolution, you can continue the +rebasing process with + + git am --resolved --3way + +Alternatively, you can undo the git-rebase with + + git reset --hard ORIG_HEAD + rm -r .dotest + OPTIONS ------- :: @@ -58,7 +70,7 @@ OPTIONS :: Upstream branch to compare against. -:: +:: Working branch; defaults to HEAD. Author