mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 05:47:53 +01:00
Code Activity
Mirror of https://github.com/git/git
830 commits 6 branches 956 tags 469 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Alexander Gavrilov 042c232535 git-gui: Support resolving conflicts via the diff context menu. 
If the file has merge conflicts, show a special version of the
diff context menu, which includes conflict resolution commands
instead of Stage Hunk/Line. This patch only supports resolving
by discarding all sides except one.

Discarding is the only way to resolve conflicts involving symlinks
and/or deletion, excluding manual editing.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-09-04 21:28:54 -07:00
lib git-gui: Support resolving conflicts via the diff context menu. 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: Support resolving conflicts via the diff context menu. 2008-09-04 21:28:54 -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