mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
980145f747
The output of `git mergetool --tool-help` and `git difftool --tool-help` only showed the `alias` of each available merge/diff tool. It is not always obvious what tool these `aliases` end up using (ex: `opendiff` runs `FileMerge` and `bc` runs `Beyond Compare`). This commit adds a short description to each of them to help the user identify the `alias` they want. Signed-off-by: Fernando Ramos <greenfoo@u92.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
40 lines
761 B
Text
40 lines
761 B
Text
can_diff () {
|
|
return 1
|
|
}
|
|
|
|
diff_cmd_help () {
|
|
echo "Use TortoiseMerge (requires a graphical session)"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
basename="$(basename "$merge_tool_path" .exe)"
|
|
if test "$basename" = "tortoisegitmerge"
|
|
then
|
|
"$merge_tool_path" \
|
|
-base "$BASE" -mine "$LOCAL" \
|
|
-theirs "$REMOTE" -merged "$MERGED"
|
|
else
|
|
"$merge_tool_path" \
|
|
-base:"$BASE" -mine:"$LOCAL" \
|
|
-theirs:"$REMOTE" -merged:"$MERGED"
|
|
fi
|
|
else
|
|
echo "$merge_tool_path cannot be used without a base" 1>&2
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
if type tortoisegitmerge >/dev/null 2>/dev/null
|
|
then
|
|
echo tortoisegitmerge
|
|
else
|
|
echo tortoisemerge
|
|
fi
|
|
}
|
|
|
|
merge_cmd_help () {
|
|
echo "Use TortoiseMerge (requires a graphical session)"
|
|
}
|