From: J. Bruce Fields <bfields@fieldses.org>
Date: Sun, 26 Mar 2006 20:29:28 +0000 (-0500)
Subject: Document git-rebase behavior on conflicts.
X-Git-Tag: v1.3.0-rc1~3^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8978d043c35ad068e280dbbdc31e06524ea0ab56;p=git.git

Document git-rebase behavior on conflicts.
---

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>::