diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-11 21:20:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-11 21:20:37 (GMT) |
| commit | 0bc409dab941d7df065c486342cefcde78647c42 (patch) | |
| tree | 931b4f8a3ece93d179f28d31d1e26d9d125f4789 /git-gui | |
| parent | e1eb84cccb927834acae58ec2c0f727c7bf184c7 (diff) | |
| parent | ff65e796f00097c118a85ac40e51405080e98627 (diff) | |
| download | git-0bc409dab941d7df065c486342cefcde78647c42.zip git-0bc409dab941d7df065c486342cefcde78647c42.tar.gz git-0bc409dab941d7df065c486342cefcde78647c42.tar.bz2 | |
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
Diffstat (limited to 'git-gui')
| -rw-r--r-- | git-gui/lib/merge.tcl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 460d32f..5ab6f8f 100644 --- a/git-gui/lib/merge.tcl +++ b/git-gui/lib/merge.tcl @@ -112,12 +112,7 @@ method _start {} { close $fh set _last_merged_branch $branch - set cmd [list git] - lappend cmd merge - lappend cmd --strategy=recursive - lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]] - lappend cmd HEAD - lappend cmd $name + set cmd [list git merge --strategy=recursive FETCH_HEAD] ui_status [mc "Merging %s and %s..." $current_branch $stitle] set cons [console::new [mc "Merge"] "merge $stitle"] |