Alexander Gavrilov 0aea2842d9 git-gui: Make Ctrl-T safe to use for conflicting files. ...

A previous patch added a check for conflict markers, which
is done when the file is about to be staged due to a click
on the icon. However, pressing Ctrl-T still immediately
stages the file without confirmation. This patch fixes it.

The check requires a loaded diff, so staging multiple files
at once won't work if they are unmerged.

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

2008-09-30 11:47:33 -07:00

lib

git-gui: Make Ctrl-T safe to use for conflicting files.

2008-09-30 11:47:33 -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: Updated German translation.

2008-09-13 14:24:16 -07:00

windows

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

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

.gitattributes

git-gui: Use gitattribute "encoding" for file content display

2008-09-24 12:48:31 -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 Ctrl-T safe to use for conflicting files.

2008-09-30 11:47:33 -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%