diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:37 -0700 |
| commit | 5a2c86fb08cc195ca39d82e2c2d84158f05b96fc (patch) | |
| tree | 79611e2f21d430a6f6ca00aa9e811c95a35fe356 /dir.h | |
| parent | 71a57ab32d211be19729c3afaf0a7c7283c7a4e2 (diff) | |
| parent | ff65e796f00097c118a85ac40e51405080e98627 (diff) | |
| download | git-5a2c86fb08cc195ca39d82e2c2d84158f05b96fc.tar.gz git-5a2c86fb08cc195ca39d82e2c2d84158f05b96fc.tar.xz | |
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
Diffstat (limited to 'dir.h')
0 files changed, 0 insertions, 0 deletions