diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-02-27 14:07:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 14:07:51 -0800 |
| commit | 6d21667206c4c2b10aad99eca1530a4f17c4e61d (patch) | |
| tree | 043b5873b9c312d39c71a09e9b6ebb641f4dd084 /.mailmap | |
| parent | Merge branch 'git-p4' of git://repo.or.cz/git/git-p4 (diff) | |
| parent | Eliminate confusing "won't bisect on seeked tree" failure (diff) | |
| download | tgif-6d21667206c4c2b10aad99eca1530a4f17c4e61d.tar.xz | |
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 '.mailmap')
0 files changed, 0 insertions, 0 deletions