diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-07-21 12:51:02 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-21 18:51:47 -0700 |
| commit | 51ef1daa4a0dfaa4d777b2fa949ba051cf800554 (patch) | |
| tree | 425a833e5262832fae1d3512722cca8c868f0965 /Documentation/git-mergetool.txt | |
| parent | Update my e-mail address (diff) | |
| download | tgif-51ef1daa4a0dfaa4d777b2fa949ba051cf800554.tar.xz | |
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-mergetool.txt')
0 files changed, 0 insertions, 0 deletions