summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-07-21 10:51:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-22 01:51:47 (GMT)
commit51ef1daa4a0dfaa4d777b2fa949ba051cf800554 (patch)
tree425a833e5262832fae1d3512722cca8c868f0965 /Documentation/user-manual.txt
parent59eb68aa2b4e52aa1d098e0d76c5130864ceff2e (diff)
downloadgit-51ef1daa4a0dfaa4d777b2fa949ba051cf800554.zip
git-51ef1daa4a0dfaa4d777b2fa949ba051cf800554.tar.gz
git-51ef1daa4a0dfaa4d777b2fa949ba051cf800554.tar.bz2
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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 8761ee7..c5641af 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 ".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: