From: David Aguilar <davvid@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
John Keeping <john@keeping.me.uk>,
Charles Bailey <charles@hashpling.org>,
Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 1/3] mergetools/kdiff3: do not use --auto when diffing
Date: Thu, 9 May 2013 02:13:28 -0700 [thread overview]
Message-ID: <1368090810-40596-1-git-send-email-davvid@gmail.com> (raw)
The `kdiff3 --auto` help message is, "No GUI if all conflicts are auto-
solvable." This flag was carried over from the original mergetool
commands. diff_cmd() is for two-way comparisons only so remove the
superfluous flag.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
This one is not RFC; just a trivial fix.
mergetools/kdiff3 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index 28fead4..a30034f 100644
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -1,5 +1,5 @@
diff_cmd () {
- "$merge_tool_path" --auto \
+ "$merge_tool_path" \
--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
"$LOCAL" "$REMOTE" >/dev/null 2>&1
}
--
1.8.3.rc1.38.g0f1704c
next reply other threads:[~2013-05-09 9:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-09 9:13 David Aguilar [this message]
2013-05-09 9:13 ` [RFC PATCH 2/3] mergetools/kdiff3: allow opting-out of auto-merges David Aguilar
2013-05-09 9:13 ` [RFC PATCH 3/3] Makefile: avoid deprecation warnings on OS X 10.8 David Aguilar
2013-05-09 15:14 ` John Keeping
2013-05-09 23:21 ` David Aguilar
2013-05-09 16:10 ` [RFC PATCH 2/3] mergetools/kdiff3: allow opting-out of auto-merges Junio C Hamano
2013-05-09 17:23 ` John Keeping
2013-05-09 19:15 ` Junio C Hamano
2013-05-09 22:17 ` David Aguilar
2013-05-10 5:41 ` Charles Bailey
2013-05-10 18:40 ` 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=1368090810-40596-1-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=tytso@mit.edu \
/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).