summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@fieldses.org>2006-03-26 20:29:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-27 03:07:43 (GMT)
commit8978d043c35ad068e280dbbdc31e06524ea0ab56 (patch)
treea2711dcaba671bff89832b4fad304eaad7811883
parentfb18a2edf7f3d1585b6330b7dde110b992d3b97c (diff)
downloadgit-8978d043c35ad068e280dbbdc31e06524ea0ab56.zip
git-8978d043c35ad068e280dbbdc31e06524ea0ab56.tar.gz
git-8978d043c35ad068e280dbbdc31e06524ea0ab56.tar.bz2
Document git-rebase behavior on conflicts.
-rw-r--r--Documentation/git-rebase.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index b36276c..4a7e67a 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>::