Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2008 22:07:51 +0000 (14:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2008 22:07:51 +0000 (14:07 -0800)
* 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

No differences found