Alexander Gavrilov b2ca414973 git-gui: Show special diffs for complex conflict cases. ...

Add special handling for displaying diffs of modified/deleted,
and symlink/mode conflicts. Currently the display is completely
unusable for deciding how to resolve the conflict.

New display modes:

1) Deleted/Modified conflict: e.g.
	LOCAL: deleted
	REMOTE:
	[diff :1:$path :3:$path]

2) Conflict involving symlinks:
	LOCAL:
	[diff :1:$path :2:$path]
	REMOTE:
	[diff :1:$path :3:$path]

In order to be able to display multiple diffs, this
patch adds a queue of commands to call.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

2008-09-04 21:28:55 -07:00

lib

git-gui: Show special diffs for complex conflict cases.

2008-09-04 21:28:55 -07:00

macosx

git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk

2008-07-25 15:08:33 -07:00

po

git-gui: Fix string escaping in po2msg.sh

2008-09-01 15:39:11 -07:00

windows

git-gui (Windows): Change wrapper to execdir 'libexec/git-core'

2008-07-29 22:43:37 -07:00

.gitignore

git-gui: Honor a config.mak in git-gui's top level

2007-10-13 22:14:14 -04:00

git-gui.sh

git-gui: Make F5 reselect a diff, if an untracked file is selected.

2008-09-04 21:28:55 -07:00

GIT-VERSION-GEN

git-gui 0.11

2008-08-10 00:02:08 -07:00

Makefile

git-gui (Windows): Switch to relative discovery of oguilib

2008-07-29 22:43:37 -07: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

866 MiB

Languages

C 49.9%

Shell 38.6%

Perl 5.1%

Tcl 3.3%

Python 0.8%

Other 2%