Re: Effective difference between git-rebase and git-resolve
On Fri, Mar 24, 2006 at 11:15:57PM -0800, Junio C Hamano wrote:
Show 8 quoted lines
> - Patch C does not apply. git-am stops here, with conflicts to
> be resolved in the working tree. Yet-to-be-applied D and E
> are still kept in .dotest/ directory at this point. What the
> user does is exactly the same as fixing up unapplicable patch
> when running git-am:
>
> - Resolve conflict just like any merge conflicts.
> - "git am --resolved --3way" to continue applying the patches.
So, does this sum it up accurately for the man page?
--b.
Document git-rebase behavior on conflicts.
---
Documentation/git-rebase.txt | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
3ef0c8cc7a505f9023a87e7e1ca22251a91bf188
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>::
--
1.2.4.g0382