Alexander Gavrilov 617ceee653 git-gui: Don't allow staging files with conflicts. ...

Prevent staging files with conflict markers by clicking
on the icon in the 'Unstaged Changes' list. Instead, pretend
that the user clicked the name, and show the diff.

Originally it made some sense to allow staging conflicting
files, because git-gui did not provide any tools to resolve
them from within the GUI. But now that we have added mergetool
capabilities, it is more likely to cause accidental and
non-undoable errors.

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: Support calling merge tools.

2008-09-04 21:28:54 -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: Don't allow staging files with conflicts.

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

865 MiB

Languages

C 49.9%

Shell 38.6%

Perl 5.1%

Tcl 3.3%

Python 0.8%

Other 2%