Document git-rebase behavior on conflicts.
J. Bruce Fields committed
Mar 26, 2006 at 15:29 UTC
8978d043c35ad068e280dbbdc31e06524ea0ab56
1 file changed
+12
Documentation/git-rebase.txt
+12
@@ -48,6 +48,18 @@ would be:
48
/
49
D---E---F---G master
50
51
+In case of conflict, git-rebase will stop at the first problematic commit
52
+and leave conflict markers in the tree. After resolving the conflict manually
53
+and updating the index with the desired resolution, you can continue the
54
+rebasing process with
55
+
56
+ git am --resolved --3way
57
+
58
+Alternatively, you can undo the git-rebase with
59
+
60
+ git reset --hard ORIG_HEAD
61
+ rm -r .dotest
62
+
63
OPTIONS
64
-------
65
<newbase>::