diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2006-03-26 15:29:28 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-26 19:07:43 -0800 |
| commit | 8978d043c35ad068e280dbbdc31e06524ea0ab56 (patch) | |
| tree | a2711dcaba671bff89832b4fad304eaad7811883 /Documentation/git-rebase.txt | |
| parent | fb18a2edf7f3d1585b6330b7dde110b992d3b97c (diff) | |
| download | git-8978d043c35ad068e280dbbdc31e06524ea0ab56.tar.gz git-8978d043c35ad068e280dbbdc31e06524ea0ab56.tar.xz | |
Document git-rebase behavior on conflicts.
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index b36276c7e..4a7e67a4d 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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 ------- <newbase>:: |