]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1eb84c ff65e79)
Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 21:20:37 +0000 (14:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 21:20:37 +0000 (14:20 -0700)
commit0bc409dab941d7df065c486342cefcde78647c42
tree931b4f8a3ece93d179f28d31d1e26d9d125f4789tree | snapshot
parente1eb84cccb927834acae58ec2c0f727c7bf184c7commit | diff
parentff65e796f00097c118a85ac40e51405080e98627commit | diff
Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint

The original command line syntax for "git merge", which was "git
merge <msg> HEAD <parent>...", has been deprecated for quite some
time, and "git gui" was the last in-tree user of the syntax.  This
is finally fixed, so that we can move forward with the deprecation.

* rs/git-gui-use-modern-git-merge-syntax:
  git-gui: stop using deprecated merge syntax
Unnamed repository; edit this file 'description' to name the repository.