| commit | 6bfd8b9d82a4bcd1877d72ad79dac64c80a6071b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 May 2015 20:18:27 +0000 (28 13:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 May 2015 20:18:27 +0000 (28 13:18 -0700) | ||
| tree | 7722ff99ae38f9622d8167fd60e5386ce7c36ac4 | treesnapshot (tar.gz zip) |
| parent | a368a479478a93fdbe3af58b3b7b5f24a74d109f | commitdiff |
| parent | b4391657ed96c8dd2881d5c9fcad39a07d8cb92a | commitdiff |
Merge branch 'jc/merge-drop-old-syntax' into next
Stop supporting "git merge <message> HEAD <commit>" syntax that
has been deprecated since October 2007.
* 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.
* 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 |