| commit | 1fdbfc443e9ef702df9a305231e15f020920c87a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Mar 2017 21:07:13 +0000 (30 14:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Mar 2017 21:07:13 +0000 (30 14:07 -0700) | ||
| tree | 0eb966f0e70b1a273ba873b93a5333b44eb28909 | treesnapshot (tar.gz zip) |
| parent | e1104a5ee539408b81566066aaa6963cb87d5cd6 | commitdiff |
| parent | b4391657ed96c8dd2881d5c9fcad39a07d8cb92a | commitdiff |
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
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 | blobhistory |
| builtin/merge.c | diff1 | diff2 | blobhistory |