Skip to content

Commit

Permalink
git-gui: Minor refactoring of merge command line in merge support
Browse files Browse the repository at this point in the history
This is just a small code movement to cleanup how we generate
the command line for a merge.  I'm only doing it to make the
next series of changes slightly more readable.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  • Loading branch information
Shawn O. Pearce committed Jul 30, 2007
1 parent dac7089 commit 84f6753
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/merge.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ method _start {} {

set spec [$w_rev get_tracking_branch]
set cmit [$w_rev get_commit]
set cmd [list git]
lappend cmd merge
lappend cmd --strategy=recursive

set fh [open [gitdir FETCH_HEAD] w]
fconfigure $fh -translation lf
Expand All @@ -112,6 +109,9 @@ method _start {} {
puts $fh "$cmit\t\tbranch '$branch' of $remote"
close $fh

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 $cmit
Expand Down

0 comments on commit 84f6753

Please sign in to comment.