git/lib at 6e4ba05c7fee0d0140e2057b63f5ca4eea9a6053 - git

Tree: 6e4ba05c7f

Shawn O. Pearce 18a01a0da4 git-gui: Allow git-merge to use branch names in conflict markers Earlier when I rewrote the merge implementation for git-gui I broke it such that the conflict markers for the "theirs" side of the hunk was using a full SHA-1 ID in hex, rather than the name of the branch the user had merged. This was because I got paranoid and passed off the full SHA-1 to git-merge, instead of giving it the reference name the user saw in the merge dialog. I'd still like to resolve the SHA-1 upfront in git-gui and always use that value throughout the merge, but I can't do that until we have a full implementation of git-merge written in Tcl. Until then its more important that the conflict markers be useful to the end-user, so we need to pass off the ref name and not the SHA-1 ID. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		17 years ago
..
blame.tcl	git-gui: Don't show blame tooltips that we have no data for	18 years ago
branch.tcl	git-gui: Always use absolute path to all git executables	18 years ago
branch_checkout.tcl	git-gui: Allow double-click in checkout dialog to start checkout	18 years ago
branch_create.tcl	git-gui: Refactor branch switch to support detached head	18 years ago
branch_delete.tcl	git-gui: Refactor branch switch to support detached head	18 years ago
branch_rename.tcl	git-gui: Refactor branch switch to support detached head	18 years ago
browser.tcl	git-gui: Use more modern looking icons in the tree browser	18 years ago
checkout_op.tcl	git-gui: Unify wording to say "to stage" instead of "to add"	18 years ago
choose_rev.tcl	git-gui: Make sure remotes are loaded when picking revisions	18 years ago
class.tcl	git-gui: Fix window manager problems on ion3	17 years ago
commit.tcl	git-gui: Unify wording to say "to stage" instead of "to add"	18 years ago
console.tcl	Merge branch 'maint'	18 years ago
database.tcl	git-gui: Delay the GC hint until after we are running	18 years ago
diff.tcl	git-gui: Always disable the Tcl EOF character when reading	18 years ago
encoding.tcl	git-gui: Translate standard encoding names to Tcl ones	18 years ago
error.tcl	git-gui: Don't crash in ask_popup if we haven't mapped main window yet	18 years ago
index.tcl	git-gui: Unify wording to say "to stage" instead of "to add"	18 years ago
merge.tcl	git-gui: Allow git-merge to use branch names in conflict markers	17 years ago
option.tcl	git-gui: Always use absolute path to all git executables	18 years ago
remote.tcl	git-gui: Save remote urls obtained from config/remotes setup	18 years ago
remote_branch_delete.tcl	git-gui: Always use absolute path to all git executables	18 years ago
shortcut.tcl	git-gui: Include a space in Cygwin shortcut command lines	18 years ago
status_bar.tcl	git-gui: Show a progress meter for checking out files	18 years ago
transport.tcl	git-gui: Refactor branch switch to support detached head	18 years ago