projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3bc5322 b439165)
Merge branch 'jc/merge-drop-old-syntax' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2017 22:05:41 +0000 (14:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2017 22:05:42 +0000 (14:05 -0800)
commit2c0f5f73d87a3d0f9480e5110ab5226fb9fb9273
treec31ace05331d7eb77e04b211499ea0c62eea5cf9tree | snapshot
parent3bc53220cb2dcf709f7a027a3f526befd021d858commit | diff
parentb4391657ed96c8dd2881d5c9fcad39a07d8cb92acommit | diff
Merge branch 'jc/merge-drop-old-syntax' into next

Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.

* jc/merge-drop-old-syntax:
  merge: drop 'git merge <message> HEAD <commit>' syntax
Documentation/git-merge.txt diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.