summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-07-16 01:33:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-16 01:49:28 (GMT)
commit28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6 (patch)
tree91186bcc0c0bd1961455d883596f2343e86bd57f /Documentation/git-am.txt
parent6c11a5fd465eb64301093de8826c38018b474bde (diff)
downloadgit-28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6.zip
git-28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6.tar.gz
git-28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6.tar.bz2
Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
Since the files generated and used during a rebase are never to be tracked, they should live in $GIT_DIR. While at it, avoid the rather meaningless term "dotest" to "rebase", and unhide ".dotest-merge". This was wished for on the mailing list, but so far unimplemented. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 1395c7d..2d7f162 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -140,9 +140,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 `.dotest`
+The command refuses to process new mailboxes while `.git/rebase`
directory exists, so if you decide to start over from scratch,
-run `rm -f -r .dotest` before running the command with mailbox
+run `rm -f -r .git/rebase` before running the command with mailbox
names.
Before any patches are applied, ORIG_HEAD is set to the tip of the