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 /git-gui | |
| parent | Merge branch 'jc/verify-loose-object-header' (diff) | |
| parent | Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-... (diff) | |
| download | tgif-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 '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 460d32fa22..5ab6f8f102 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"] |