diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-07-21 14:51:02 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-22 05:51:47 +0400 |
| commit | 51ef1daa4a0dfaa4d777b2fa949ba051cf800554 (patch) | |
| tree | 425a833e5262832fae1d3512722cca8c868f0965 /Documentation/git-rebase.txt | |
| parent | 59eb68aa2b4e52aa1d098e0d76c5130864ceff2e (diff) | |
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/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 58a5c746ba..59c1b021a6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -39,8 +39,8 @@ It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To restore the -original <branch> and remove the .git/rebase working files, use the command -`git rebase --abort` instead. +original <branch> and remove the .git/rebase-apply working files, use the +command `git rebase --abort` instead. Assume the following history exists and the current branch is "topic": |