]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1104a5 b439165)
Merge branch 'jc/merge-drop-old-syntax'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:13 +0000 (14:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:13 +0000 (14:07 -0700)
commit1fdbfc443e9ef702df9a305231e15f020920c87a
tree0eb966f0e70b1a273ba873b93a5333b44eb28909tree | snapshot
parente1104a5ee539408b81566066aaa6963cb87d5cd6commit | diff
parentb4391657ed96c8dd2881d5c9fcad39a07d8cb92acommit | diff
Merge branch 'jc/merge-drop-old-syntax'

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.