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>

2007-08-20 02:17:05 -04:00

lib

git-gui: Allow git-merge to use branch names in conflict markers

2007-08-20 02:17:05 -04:00

.gitignore

git-gui: Refactor into multiple files to save my sanity

2007-05-07 23:35:48 -04:00

git-gui.sh

git-gui: Fix window manager problems on ion3

2007-08-20 00:38:13 -04:00

GIT-VERSION-GEN

Merge branch 'maint'

2007-06-11 19:06:15 -04:00

Makefile

Merge branch 'maint'

2007-06-27 00:36:38 -04:00

Description

Git Source Code Mirror - This is a publish-only repository but pull requests can be turned into patches to the mailing list via GitGitGadget (https://gitgitgadget.github.io/). Please follow Documentation/SubmittingPatches procedure for any of your improvements.

chacktoberfestshell

798 MiB

Languages

C 50.1%

Shell 38.4%

Perl 5.1%

Tcl 3.3%

Python 0.8%

Other 2%