* [PATCH] mergetools: add support for guiffy
@ 2018-04-05 13:55 Bill Ritcher
2018-04-05 17:07 ` David Aguilar
0 siblings, 1 reply; 2+ messages in thread
From: Bill Ritcher @ 2018-04-05 13:55 UTC (permalink / raw)
To: git; +Cc: davvid, Bill Ritcher
Add guiffy as difftool and mergetool
guiffy is available on Windows, Linux, and MacOS
Signed-off-by: Bill Ritcher <Bill_Ritcher@guiffy.com>
---
mergetools/guiffy | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 mergetools/guiffy
diff --git a/mergetools/guiffy b/mergetools/guiffy
new file mode 100644
index 000000000..8b23a13c4
--- /dev/null
+++ b/mergetools/guiffy
@@ -0,0 +1,18 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+ if $base_present
+ then
+ "$merge_tool_path" -s "$LOCAL" \
+ "$REMOTE" "$BASE" "$MERGED"
+ else
+ "$merge_tool_path" -m "$LOCAL" \
+ "$REMOTE" "$MERGED"
+ fi
+}
+
+exit_code_trustable () {
+ true
+}
--
2.15.1.windows.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] mergetools: add support for guiffy
2018-04-05 13:55 [PATCH] mergetools: add support for guiffy Bill Ritcher
@ 2018-04-05 17:07 ` David Aguilar
0 siblings, 0 replies; 2+ messages in thread
From: David Aguilar @ 2018-04-05 17:07 UTC (permalink / raw)
To: Bill Ritcher; +Cc: git, Junio C Hamano
On Thu, Apr 05, 2018 at 08:55:01AM -0500, Bill Ritcher wrote:
> Add guiffy as difftool and mergetool
>
> guiffy is available on Windows, Linux, and MacOS
>
> Signed-off-by: Bill Ritcher <Bill_Ritcher@guiffy.com>
> ---
> mergetools/guiffy | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
> create mode 100644 mergetools/guiffy
>
> diff --git a/mergetools/guiffy b/mergetools/guiffy
> new file mode 100644
> index 000000000..8b23a13c4
> --- /dev/null
> +++ b/mergetools/guiffy
> @@ -0,0 +1,18 @@
> +diff_cmd () {
> + "$merge_tool_path" "$LOCAL" "$REMOTE"
> +}
> +
> +merge_cmd () {
> + if $base_present
> + then
> + "$merge_tool_path" -s "$LOCAL" \
> + "$REMOTE" "$BASE" "$MERGED"
> + else
> + "$merge_tool_path" -m "$LOCAL" \
> + "$REMOTE" "$MERGED"
> + fi
> +}
> +
> +exit_code_trustable () {
> + true
> +}
> --
> 2.15.1.windows.2
I tested this on Linux and it works great. Thanks Bill.
Acked-by: David Aguilar <davvid@gmail.com>
cheers,
--
David
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-05 17:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-05 13:55 [PATCH] mergetools: add support for guiffy Bill Ritcher
2018-04-05 17:07 ` David Aguilar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).