mirror of
https://github.com/git/git.git
synced 2024-04-24 17:55:08 +02: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>
23 lines
418 B
Plaintext
23 lines
418 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
|
|
}
|
|
|
|
diff_cmd_help () {
|
|
echo "Use FileMerge (requires a graphical session)"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
|
-ancestor "$BASE" -merge "$MERGED" | cat
|
|
else
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
|
-merge "$MERGED" | cat
|
|
fi
|
|
}
|
|
|
|
merge_cmd_help () {
|
|
echo "Use FileMerge (requires a graphical session)"
|
|
}
|