path: root/Documentation/git-am.txt
diff options
authorJohannes Schindelin <>2008-07-21 10:51:02 (GMT)
committerJunio C Hamano <>2008-07-22 01:51:47 (GMT)
commit51ef1daa4a0dfaa4d777b2fa949ba051cf800554 (patch)
tree425a833e5262832fae1d3512722cca8c868f0965 /Documentation/git-am.txt
parent59eb68aa2b4e52aa1d098e0d76c5130864ceff2e (diff)
Rename .git/rebase to .git/rebase-apply
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-am.txt')
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 719e924..c45c53e 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -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
Before any patches are applied, ORIG_HEAD is set to the tip of the