From: David Aguilar <davvid@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, charles@hashpling.org,
markus.heidelberg@web.de, David Aguilar <davvid@gmail.com>
Subject: [PATCH 04/14] difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
Date: Mon, 6 Apr 2009 01:31:19 -0700 [thread overview]
Message-ID: <1239006689-14695-5-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1239006689-14695-4-git-send-email-davvid@gmail.com>
We shouldn't try to merge files when using difftool, so remove
any merge-specific options.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
contrib/difftool/git-difftool-helper | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper
index e481913..ef684b6 100755
--- a/contrib/difftool/git-difftool-helper
+++ b/contrib/difftool/git-difftool-helper
@@ -69,7 +69,7 @@ launch_merge_tool () {
"$merge_tool_path" --auto \
--L1 "$basename (A)" \
--L2 "$basename (B)" \
- -o "$MERGED" "$LOCAL" "$REMOTE" \
+ "$LOCAL" "$REMOTE" \
> /dev/null 2>&1
;;
@@ -78,7 +78,7 @@ launch_merge_tool () {
;;
tkdiff)
- "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
;;
meld)
@@ -95,17 +95,13 @@ launch_merge_tool () {
xxdiff)
"$merge_tool_path" \
- -X \
- -R 'Accel.SaveAsMerged: "Ctrl-S"' \
-R 'Accel.Search: "Ctrl+F"' \
-R 'Accel.SearchForward: "Ctrl-G"' \
- --merged-file "$MERGED" \
"$LOCAL" "$REMOTE"
;;
opendiff)
- "$merge_tool_path" "$LOCAL" "$REMOTE" \
- -merge "$MERGED" | cat
+ "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
;;
ecmerge)
--
1.6.2.2.414.g81aa9
next prev parent reply other threads:[~2009-04-06 8:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-06 8:31 git-{merge,diff}tool refactor round three David Aguilar
2009-04-06 8:31 ` [PATCH 01/14] doc/merge-config: list ecmerge as a built-in merge tool David Aguilar
2009-04-06 8:31 ` [PATCH 02/14] git-mergetool/difftool: make (g)vimdiff workable under Windows David Aguilar
2009-04-06 8:31 ` [PATCH 03/14] git-mergetool: add new merge tool TortoiseMerge David Aguilar
2009-04-06 8:31 ` David Aguilar [this message]
2009-04-06 8:31 ` [PATCH 05/14] difftool: remove the backup file feature David Aguilar
2009-04-06 8:31 ` [PATCH 06/14] difftool: use perl built-ins when testing for msys David Aguilar
2009-04-06 8:31 ` [PATCH 07/14] difftool: add a -y shortcut for --no-prompt David Aguilar
2009-04-06 8:31 ` [PATCH 08/14] difftool/mergetool: add diffuse as merge and diff tool David Aguilar
2009-04-06 8:31 ` [PATCH 09/14] difftool: move 'git-difftool' out of contrib David Aguilar
2009-04-06 8:31 ` [PATCH 10/14] difftool: add various git-difftool tests David Aguilar
2009-04-06 8:31 ` [PATCH 11/14] difftool: add support for a difftool.prompt config variable David Aguilar
2009-04-06 8:31 ` [PATCH 12/14] bash completion: add git-difftool David Aguilar
2009-04-06 8:31 ` [PATCH 13/14] mergetool: use $( ... ) instead of `backticks` David Aguilar
2009-04-06 8:31 ` [PATCH 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib David Aguilar
2009-04-06 23:42 ` [PATCH 09/14] difftool: move 'git-difftool' out of contrib Markus Heidelberg
2009-04-06 22:17 ` [PATCH 07/14] difftool: add a -y shortcut for --no-prompt Markus Heidelberg
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1239006689-14695-5-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=markus.heidelberg@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).