development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Document git-rebase behavior on conflicts.

Browse source
This commit is contained in:
J. Bruce Fields 2006-03-26 15:29:28 -05:00 committed by Junio C Hamano
parent fb18a2edf7
commit 8978d043c3
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Documentation/git-rebase.txt
View file

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