summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-07-21 12:51:02 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-21 18:51:47 -0700
commit51ef1daa4a0dfaa4d777b2fa949ba051cf800554 (patch)
tree425a833e5262832fae1d3512722cca8c868f0965 /builtin-merge-recursive.c
parent59eb68aa2b4e52aa1d098e0d76c5130864ceff2e (diff)
downloadgit-51ef1daa4a0dfaa4d777b2fa949ba051cf800554.tar.gz
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 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions