diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-28 01:07:51 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-28 01:07:51 +0300 |
commit | 6d21667206c4c2b10aad99eca1530a4f17c4e61d (patch) | |
tree | 043b5873b9c312d39c71a09e9b6ebb641f4dd084 /t | |
parent | a0a80f1e8ac367634314ee8e2ca159c527da3a24 (diff) | |
parent | 0f497e75f05cdf0c0c1278eaba898cda6f118d71 (diff) |
Merge branch 'maint'
* maint:
Eliminate confusing "won't bisect on seeked tree" failure
builtin-reflog.c: don't install new reflog on write failure
send-email: fix In-Reply-To regression
Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
Prompt to continue when editing during rebase --interactive
Documentation/git svn log: add a note about timezones.
Don't use GIT_CONFIG in t5505-remote
Conflicts:
t/t9001-send-email.sh
t/t9200-git-cvsexportcommit.sh
Diffstat (limited to 't')
-rwxr-xr-x | t/t5505-remote.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 636aec2f71..4fc62f550c 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -4,9 +4,6 @@ test_description='git remote porcelain-ish' . ./test-lib.sh -GIT_CONFIG=.git/config -export GIT_CONFIG - setup_repository () { mkdir "$1" && ( cd "$1" && |