git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bill Ritcher <Bill_Ritcher@guiffy.com>
To: git@vger.kernel.org
Cc: davvid@gmail.com, Bill Ritcher <Bill_Ritcher@guiffy.com>
Subject: [PATCH] mergetools: add support for guiffy
Date: Thu,  5 Apr 2018 08:55:01 -0500	[thread overview]
Message-ID: <20180405135501.12836-1-Bill_Ritcher@guiffy.com> (raw)

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


             reply	other threads:[~2018-04-05 14:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-05 13:55 Bill Ritcher [this message]
2018-04-05 17:07 ` [PATCH] mergetools: add support for guiffy David Aguilar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180405135501.12836-1-Bill_Ritcher@guiffy.com \
    --to=bill_ritcher@guiffy.com \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).