diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-03-27 07:51:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-03-27 07:51:03 +0000 |
| commit | f02e09f2b8259643f2cb156fd7ceec3113f8204f (patch) | |
| tree | 0730716cdf9cd00147cfb0815af4935619f620bd /git-rebase.txt | |
| parent | 818f7d62d47fafdea279838be1e4aa7401c3af6c (diff) | |
| download | git-htmldocs-f02e09f2b8259643f2cb156fd7ceec3113f8204f.tar.gz | |
Autogenerated HTML docs for v1.2.4-gb0a3de4
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index b36276c7e..4a7e67a4d 100644 --- a/git-rebase.txt +++ b/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>:: |