]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71a57ab ff65e79)
Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:36 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:37 +0000 (13:30 -0700)
commit5a2c86fb08cc195ca39d82e2c2d84158f05b96fc
tree79611e2f21d430a6f6ca00aa9e811c95a35fe356tree | snapshot
parent71a57ab32d211be19729c3afaf0a7c7283c7a4e2commit | diff
parentff65e796f00097c118a85ac40e51405080e98627commit | diff
Merge branch 'rs/git-gui-use-modern-git-merge-syntax'

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.