commit | 0748494e866041034605aaf177f29a61bdc25951 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Dec 02 10:30:12 2009 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Dec 02 10:30:12 2009 -0800 |
tree | e48f6c091a7231ae0db5d643215df16c5bd7a8d9 | |
parent | c86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e [diff] | |
parent | 28044baba6d268d91057398ffa041ee1b931a5e0 [diff] |
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