mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +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>
38 lines
913 B
Text
38 lines
913 B
Text
diff_cmd () {
|
|
"$merge_tool_path" \
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
|
-R 'Accel.SearchForward: "Ctrl+G"' \
|
|
"$LOCAL" "$REMOTE"
|
|
|
|
# xxdiff can segfault on binary files which are often uninteresting.
|
|
# Do not allow segfaults to stop us from continuing on to the next file.
|
|
if test $? = 128
|
|
then
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
diff_cmd_help () {
|
|
echo "Use xxdiff (requires a graphical session)"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" -X --show-merged-pane \
|
|
-R 'Accel.SaveAsMerged: "Ctrl+S"' \
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
|
-R 'Accel.SearchForward: "Ctrl+G"' \
|
|
--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
|
|
else
|
|
"$merge_tool_path" -X $extra \
|
|
-R 'Accel.SaveAsMerged: "Ctrl+S"' \
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
|
-R 'Accel.SearchForward: "Ctrl+G"' \
|
|
--merged-file "$MERGED" "$LOCAL" "$REMOTE"
|
|
fi
|
|
}
|
|
|
|
merge_cmd_help () {
|
|
echo "Use xxdiff (requires a graphical session)"
|
|
}
|