With git-am, it sounds awkward to have the patches in ".git/rebase/",
but for technical reasons, we have to keep the same directory name
for git-am and git-rebase. ".git/rebase-apply" seems to be a good
compromise.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin17 years agocommitted byJunio C Hamano
@ -301,7 +301,7 @@ If it does not apply correctly, there can be various reasons.
@@ -301,7 +301,7 @@ If it does not apply correctly, there can be various reasons.
patch appropriately.
* Your MUA corrupted your patch; "am" would complain that
the patch does not apply. Look at .git/rebase/ subdirectory and
the patch does not apply. Look at .git/rebase-apply/ subdirectory and
see what 'patch' file contains and check for the common
@ -143,9 +143,9 @@ aborts in the middle,. You can recover from this in one of two ways:
@@ -143,9 +143,9 @@ aborts in the middle,. You can recover from this in one of two ways:
the index file to bring it in a state that the patch should
have produced. Then run the command with '--resolved' option.
The command refuses to process new mailboxes while `.git/rebase`
The command refuses to process new mailboxes while `.git/rebase-apply`
directory exists, so if you decide to start over from scratch,
run `rm -f -r .git/rebase` before running the command with mailbox
run `rm -f -r .git/rebase-apply` before running the command with mailbox
names.
Before any patches are applied, ORIG_HEAD is set to the tip of the
@ -39,8 +39,8 @@ It is possible that a merge failure will prevent this process from being
@@ -39,8 +39,8 @@ It is possible that a merge failure will prevent this process from being
completely automatic. You will have to resolve any such merge failure
and run `git rebase --continue`. Another option is to bypass the commit
that caused the merge failure with `git rebase --skip`. To restore the
original <branch> and remove the .git/rebase working files, use the command
`git rebase --abort` instead.
original <branch> and remove the .git/rebase-apply working files, use the
command `git rebase --abort` instead.
Assume the following history exists and the current branch is "topic":
@ -14,8 +14,8 @@ It is possible that a merge failure will prevent this process from being
@@ -14,8 +14,8 @@ It is possible that a merge failure will prevent this process from being
completely automatic. You will have to resolve any such merge failure
and run git rebase --continue. Another option is to bypass the commit
that caused the merge failure with git rebase --skip. To restore the
original <branch> and remove the .git/rebase working files, use the command
git rebase --abort instead.
original <branch> and remove the .git/rebase-apply working files, use the
command git rebase --abort instead.
Note that if <branch> is not specified on the command line, the
currently checked out branch is used.
@ -150,7 +150,7 @@ while test $# != 0
@@ -150,7 +150,7 @@ while test $# != 0
do
case "$1" in
--continue)
test -d "$dotest" -o -d "$GIT_DIR"/rebase ||
test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
@ -87,7 +87,9 @@ test_expect_success 'multiple dcommit from git-svn will not clobber svn' "
@@ -87,7 +87,9 @@ test_expect_success 'multiple dcommit from git-svn will not clobber svn' "
"
test_expect_success 'check that rebase really failed' 'test -d .git/rebase'
test_expect_success 'check that rebase really failed' '
test -d .git/rebase-apply
'
test_expect_success 'resolve, continue the rebase and dcommit' "