projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8d7a455 b439165)
Merge branch 'jc/merge-drop-old-syntax' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2016 19:37:59 +0000 (11:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2016 19:37:59 +0000 (11:37 -0800)
commit041946dae0bec76571afef42b941703eed0deca2
treecab6576d1fe328b8cc687e3ff9b257ca0b898fddtree | snapshot
parent8d7a455ed52e2a96debc080dfc011b6bb00db5d2commit | 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.