summaryrefslogtreecommitdiffstats
path: root/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-22 09:20:44 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-22 09:20:44 +0000
commit0868a302deebe5253106fdf9af00c82e2c711e66 (patch)
treef24a8821760fc2732d75ec72e5527620e5138fa6 /user-manual.txt
parent5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f (diff)
downloadgit-htmldocs-0868a302deebe5253106fdf9af00c82e2c711e66.tar.gz
Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
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 8761ee7e7..c5641af19 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 ".git/rebase"), update mywork to
+them as patches (in a directory named ".git/rebase-apply"), 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: