diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-12-02 10:30:12 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-12-02 10:30:12 -0800 |
commit | 0748494e866041034605aaf177f29a61bdc25951 (patch) | |
tree | e48f6c091a7231ae0db5d643215df16c5bd7a8d9 /t/t1402-check-ref-format.sh | |
parent | Update draft release notes to 1.6.6 before -rc1 (diff) | |
parent | Prepare for 1.6.5.4 (diff) | |
download | tgif-0748494e866041034605aaf177f29a61bdc25951.tar.xz |
Merge branch 'maint'
* maint:
Prepare for 1.6.5.4
merge: do not add standard message when message is given with -m option
Do not misidentify "git merge foo HEAD" as an old-style invocation
Conflicts:
RelNotes
Diffstat (limited to 't/t1402-check-ref-format.sh')
0 files changed, 0 insertions, 0 deletions