mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
![Fernando Ramos](/assets/img/avatar_default.png)
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>
34 lines
818 B
Plaintext
34 lines
818 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
|
|
}
|
|
|
|
diff_cmd_help () {
|
|
echo "Use DeltaWalker (requires a graphical session)"
|
|
}
|
|
|
|
merge_cmd () {
|
|
# Adding $(pwd)/ in front of $MERGED should not be necessary.
|
|
# However without it, DeltaWalker (at least v1.9.8 on Windows)
|
|
# crashes with a JRE exception. The DeltaWalker user manual,
|
|
# shows $(pwd)/ whenever the '-merged' options is given.
|
|
# Adding it here seems to work around the problem.
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
|
|
else
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
|
|
fi >/dev/null 2>&1
|
|
}
|
|
|
|
merge_cmd_help () {
|
|
echo "Use DeltaWalker (requires a graphical session)"
|
|
}
|
|
|
|
translate_merge_tool_path () {
|
|
echo DeltaWalker
|
|
}
|
|
|
|
exit_code_trustable () {
|
|
true
|
|
}
|