path: root/Documentation/user-manual.txt
diff options
authorJohannes Schindelin <>2008-07-16 01:33:44 (GMT)
committerJunio C Hamano <>2008-07-16 01:49:28 (GMT)
commit28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6 (patch)
tree91186bcc0c0bd1961455d883596f2343e86bd57f /Documentation/user-manual.txt
parent6c11a5fd465eb64301093de8826c38018b474bde (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/user-manual.txt')
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 92d4007..8761ee7 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2431,7 +2431,7 @@ $ git rebase origin
This will remove each of your commits from mywork, temporarily saving
-them as patches (in a directory named ".dotest"), update mywork to
+them as patches (in a directory named ".git/rebase"), update mywork to
point at the latest version of origin, then apply each of the saved
patches to the new mywork. The result will look like: