summaryrefslogtreecommitdiffstats
path: root/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-16 03:23:57 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-16 03:23:57 +0000
commitf5a9362a72a5a586926fce49c90c93a75cbad2b5 (patch)
treed4750ea1466329b97186f9eac8f898611a6fbbad /user-manual.txt
parent38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (diff)
downloadgit-htmldocs-f5a9362a72a5a586926fce49c90c93a75cbad2b5.tar.gz
Autogenerated HTML docs for v1.5.6.3-384-gfcab4
Diffstat (limited to 'user-manual.txt')
-rw-r--r--user-manual.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/user-manual.txt b/user-manual.txt
index 92d400753..8761ee7e7 100644
--- a/user-manual.txt
+++ b/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: