]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/merge.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d45366e) | patch
merge: drop 'git merge <message> HEAD <commit>' syntax
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Mar 2015 05:00:48 +0000 (22:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2015 20:54:40 +0000 (13:54 -0700)
commitb4391657ed96c8dd2881d5c9fcad39a07d8cb92a
tree1f457683927dc54401f6e17bb5d7c79b65fa230etree | snapshot
parentd45366e8aa922037e7e84c3f35924d2b1399a453commit | diff
merge: drop 'git merge <message> HEAD <commit>' syntax

And then if we and our users survived the previous "start warning if
the old syntax is used" patch for a few years, we could apply this
to actually drop the support for the ancient syntax.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge.txt diff | blob | blame | history
builtin/merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.