OSDN Git Service

(root) / git-core / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c86485d 28044ba)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Dec 2009 18:30:12 +0000 (10:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Dec 2009 18:30:12 +0000 (10:30 -0800)
* 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

1  2 
builtin-merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin-merge.c
Simple merge
Mirror of official git.git repository
About OSDN
Find Software
Develop Software
Help