Shawn O. Pearce ead49f5a4f git-gui: Format tracking branch merges as though they were pulls ... If we are merging a tracking branch we know exactly what remote URL that branch is fetched from, and what its name is on that remote repository. In this case we can setup a merge message that looks just like a standard `git-pull $remote $branch` operation by filling out FETCH_HEAD before we start git-merge, and then run git-merge just like git-pull does. I think the result of this behavior is that merges look a lot nicer when the came off of local tracking branches, because they no longer say "commit 'origin/...'" to describe the commit being merged but instead now mention the specific repository we fetched those commits from. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		2007-07-25 04:54:53 -04:00
..
blame.tcl	git-gui: Don't show blame tooltips that we have no data for	2007-07-19 01:45:42 -04:00
branch_checkout.tcl
branch_create.tcl
branch_delete.tcl
branch_rename.tcl
branch.tcl
browser.tcl	git-gui: Allow users to browse any branch, not just the current one	2007-07-18 01:39:27 -04:00
checkout_op.tcl	git-gui: Avoid unnecessary symbolic-ref call during checkout	2007-07-23 01:28:35 -04:00
choose_rev.tcl	git-gui: Show ref last update times in revision chooser tooltips	2007-07-25 04:23:20 -04:00
class.tcl
commit.tcl	git-gui: Paper bag fix quitting crash after commit	2007-07-23 00:20:04 -04:00
console.tcl
database.tcl
diff.tcl
encoding.tcl	git-gui: Translate standard encoding names to Tcl ones	2007-07-19 01:27:17 -04:00
error.tcl
index.tcl
merge.tcl	git-gui: Format tracking branch merges as though they were pulls	2007-07-25 04:54:53 -04:00
option.tcl
remote_branch_delete.tcl
remote.tcl	git-gui: Save remote urls obtained from config/remotes setup	2007-07-25 04:23:09 -04:00
shortcut.tcl
status_bar.tcl
transport.tcl