H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-03-16 11:55:16 +00:00
Code Releases Activity

[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool

Browse Source 
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Acked-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Dan McGee 2007-06-05 21:19:47 -04:00 committed by Theodore Ts'o
parent e58db03bbe
commit 730b5b45fb
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -531,7 +531,7 @@ merge.summary::
merge.tool:: merge.tool::
Controls which merge resolution program is used by Controls which merge resolution program is used by
gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff", gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff",
"meld", "xxdiff", "emerge", "vimdiff", and "opendiff" "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
merge.verbosity:: merge.verbosity::
Controls the amount of output shown by the recursive merge Controls the amount of output shown by the recursive merge

2
Documentation/git-mergetool.txt
View File

@ -25,7 +25,7 @@ OPTIONS
-t or --tool=<tool>:: -t or --tool=<tool>::
Use the merge resolution program specified by <tool>. Use the merge resolution program specified by <tool>.
Valid merge tools are: Valid merge tools are:
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff
+ +
If a merge resolution program is not specified, 'git mergetool' If a merge resolution program is not specified, 'git mergetool'
will use the configuration variable merge.tool. If the will use the configuration variable merge.tool. If the

12
git-mergetool.sh
View File

@ -215,6 +215,12 @@ merge_file () {
check_unchanged check_unchanged
save_backup save_backup
;; ;;
gvimdiff)
touch "$BACKUP"
gvimdiff -f -- "$LOCAL" "$path" "$REMOTE"
check_unchanged
save_backup
;;
xxdiff) xxdiff)
touch "$BACKUP" touch "$BACKUP"
if base_present ; then if base_present ; then
@ -293,7 +299,7 @@ done
if test -z "$merge_tool"; then if test -z "$merge_tool"; then
merge_tool=`git-config merge.tool` merge_tool=`git-config merge.tool`
case "$merge_tool" in case "$merge_tool" in
kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | "") kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | "")
;; # happy ;; # happy
*) *)
echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
@ -312,6 +318,8 @@ if test -z "$merge_tool" ; then
merge_tool=xxdiff merge_tool=xxdiff
elif type meld >/dev/null 2>&1 && test -n "$DISPLAY"; then elif type meld >/dev/null 2>&1 && test -n "$DISPLAY"; then
merge_tool=meld merge_tool=meld
elif type gvimdiff >/dev/null 2>&1 && test -n "$DISPLAY"; then
merge_tool=gvimdiff
elif type opendiff >/dev/null 2>&1; then elif type opendiff >/dev/null 2>&1; then
merge_tool=opendiff merge_tool=opendiff
elif type emacs >/dev/null 2>&1; then elif type emacs >/dev/null 2>&1; then
@ -325,7 +333,7 @@ if test -z "$merge_tool" ; then
fi fi
case "$merge_tool" in case "$merge_tool" in
kdiff3|tkdiff|meld|xxdiff|vimdiff|opendiff) kdiff3|tkdiff|meld|xxdiff|vimdiff|gvimdiff|opendiff)
if ! type "$merge_tool" > /dev/null 2>&1; then if ! type "$merge_tool" > /dev/null 2>&1; then
echo "The merge tool $merge_tool is not available" echo "The merge tool $merge_tool is not available"
exit 1 exit 1