| commit | 7e30682ce042fdea1ff2c76226b17d9affe2f9bf | |
| author | Alexander Gavrilov <angavrilov@gmail.com> | |
| Sat, 30 Aug 2008 20:56:51 +0000 (31 00:56 +0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 5 Sep 2008 04:28:54 +0000 (4 21:28 -0700) | ||
| tree | 0e544ab4c3a8fa07a96dc89637e9807ab7e2a0bb | treesnapshot (tar.gz zip) |
| parent | 042c232535c329f168e8a515588f38a4117954fb | commitdiff |
git-gui: Support calling merge tools.
Adds an item to the diff context menu in conflict mode,
which invokes a merge tool for the selected file. Tool
command-line handling code was ported from git-mergetool.
Automatic default tool selection and custom merge tools
are not supported. If merge.tool is not set, git-gui
defaults to meld.
This implementation uses a checkout-index hack in order
to retrieve all stages with autocrlf and filters properly
applied. It requires temporarily moving the original
conflict file out of the way.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Adds an item to the diff context menu in conflict mode,
which invokes a merge tool for the selected file. Tool
command-line handling code was ported from git-mergetool.
Automatic default tool selection and custom merge tools
are not supported. If merge.tool is not set, git-gui
defaults to meld.
This implementation uses a checkout-index hack in order
to retrieve all stages with autocrlf and filters properly
applied. It requires temporarily moving the original
conflict file out of the way.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-gui.sh | diffblobblamehistory | |
| lib/mergetool.tcl | diffblobblamehistory | |
| lib/option.tcl | diffblobblamehistory |