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 /t/t3401-rebase-partial.sh | |
| 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 't/t3401-rebase-partial.sh')
| -rwxr-xr-x | t/t3401-rebase-partial.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 36d9a2ae3a..166ddb1447 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -50,7 +50,7 @@ test_debug \ test_expect_success \ 'rebase topic branch against new master and check git-am did not get halted' \ - 'git-rebase master && test ! -d .git/rebase' + 'git-rebase master && test ! -d .git/rebase-apply' test_expect_success \ 'rebase --merge topic branch that was partially merged upstream' \ |