![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Feb 2008 22:07:51 +0000 (14:07 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Feb 2008 22:07:51 +0000 (14:07 -0800) | ||
| commit | 6d21667206c4c2b10aad99eca1530a4f17c4e61d | |
| tree | 043b5873b9c312d39c71a09e9b6ebb641f4dd084 | tree | snapshot |
| parent | a0a80f1e8ac367634314ee8e2ca159c527da3a24 | commit | diff |
| parent | 0f497e75f05cdf0c0c1278eaba898cda6f118d71 | commit | 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
* 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
| Documentation/git-svn.txt | diff1 | | diff2 | | blob | history |