From: Junio C Hamano <gitster@pobox.com>
To: Sam Vilain <sam.vilain@catalyst.net.nz>
Cc: git@vger.kernel.org, tytso@mit.edu
Subject: Re: [PATCH] git-mergetool: add support for ediff
Date: Sat, 30 Jun 2007 10:19:33 -0700 [thread overview]
Message-ID: <7vk5tle4wq.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 11831937822950-git-send-email-sam.vilain@catalyst.net.nz
Sam Vilain <sam.vilain@catalyst.net.nz> writes:
> There was emerge already but I much prefer this mode.
I thought Ted said he'll look into clearning this up, so I won't
apply it yet at this moment to my tree, but have one comment...
> @@ -320,15 +329,15 @@ if test -z "$merge_tool" ; then
> fi
> fi
> if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
> - merge_tool_candidates="$merge_tool_candidates emerge"
> + merge_tool_candidates="$merge_tool_candidates emerge ediff"
> fi
> if echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then
> merge_tool_candidates="$merge_tool_candidates vimdiff"
> fi
> - merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff"
> + merge_tool_candidates="$merge_tool_candidates opendiff ediff emerge vimdiff"
> echo "merge tool candidates: $merge_tool_candidates"
So by default outside X environment, if your $EDITOR is emacs,
you would use emerge and not ediff, but if your $EDITOR is unset
and have emacs in your $PATH you would use ediff not emerge?
next prev parent reply other threads:[~2007-06-30 17:19 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-30 8:56 a bunch of outstanding updates Sam Vilain
2007-06-30 8:56 ` [PATCH] repack: improve documentation on -a option Sam Vilain
2007-06-30 8:56 ` [PATCH] git-svn: use git-log rather than rev-list | xargs cat-file Sam Vilain
2007-06-30 8:56 ` [PATCH] git-svn: cache max revision in rev_db databases Sam Vilain
2007-06-30 8:56 ` [PATCH] GIT-VERSION-GEN: don't convert - delimiter to .'s Sam Vilain
2007-06-30 8:56 ` [PATCH] git-remote: document -n Sam Vilain
2007-06-30 8:56 ` [PATCH] git-remote: allow 'git-remote fetch' as a synonym for 'git fetch' Sam Vilain
2007-06-30 8:56 ` [PATCH] git-merge-ff: fast-forward only merge Sam Vilain
2007-06-30 8:56 ` [PATCH] git-mergetool: add support for ediff Sam Vilain
2007-06-30 8:56 ` [PATCH] contrib/hooks: add post-update hook for updating working copy Sam Vilain
2007-06-30 8:56 ` [PATCH] git-repack: generational repacking (and example hook script) Sam Vilain
2007-07-03 3:36 ` Nicolas Pitre
2007-07-03 4:58 ` Sam Vilain
2007-07-03 14:45 ` Nicolas Pitre
2007-07-03 14:55 ` Shawn O. Pearce
2007-07-04 0:05 ` Sam Vilain
2007-07-04 1:01 ` Johannes Schindelin
2007-07-04 6:16 ` Sam Vilain
2007-07-04 7:02 ` Alex Riesen
2007-07-04 15:42 ` Nicolas Pitre
2007-06-30 17:19 ` [PATCH] contrib/hooks: add post-update hook for updating working copy Junio C Hamano
2007-07-01 22:30 ` Sam Vilain
2007-07-02 1:10 ` Junio C Hamano
2007-06-30 17:19 ` Junio C Hamano [this message]
2007-07-01 22:33 ` [PATCH] git-mergetool: add support for ediff Sam Vilain
2007-06-30 14:28 ` [PATCH] git-merge-ff: fast-forward only merge Johannes Schindelin
2007-06-30 18:32 ` Matthias Lederhofer
2007-06-30 17:19 ` [PATCH] git-remote: allow 'git-remote fetch' as a synonym for 'git fetch' Junio C Hamano
2007-06-30 11:12 ` [PATCH] git-remote: document -n Frank Lichtenheld
2007-06-30 17:19 ` [PATCH] GIT-VERSION-GEN: don't convert - delimiter to .'s Junio C Hamano
2007-07-11 10:49 ` Jakub Narebski
2007-07-01 3:50 ` [PATCH] git-svn: cache max revision in rev_db databases Junio C Hamano
2007-07-01 5:31 ` Eric Wong
2007-07-01 6:49 ` Junio C Hamano
2007-06-30 11:15 ` [PATCH] repack: improve documentation on -a option Frank Lichtenheld
2007-06-30 17:19 ` Junio C Hamano
2007-06-30 11:05 ` a bunch of outstanding updates Frank Lichtenheld
-- strict thread matches above, loose matches on Subject: below --
2007-06-29 1:00 [PATCH] git-mergetool: add support for ediff Sam Vilain
2007-06-29 1:31 ` Jason Sewall
2007-06-29 4:03 ` Theodore Tso
2007-07-02 2:04 ` Theodore Tso
2007-07-02 2:32 ` Junio C Hamano
2007-07-02 3:05 ` Theodore Tso
2007-07-02 4:49 ` Junio C Hamano
2007-07-02 14:48 ` Theodore Tso
2007-07-02 23:11 ` Junio C Hamano
2007-07-02 21:32 ` Sam Vilain
2007-07-02 21:58 ` Theodore Tso
2007-07-02 22:16 ` Theodore Tso
2007-07-02 23:19 ` Sam Vilain
2007-07-03 1:09 ` Theodore Tso
2007-07-03 6:27 ` Sam Vilain
2007-07-28 9:22 ` David Kastrup
2007-07-29 2:38 ` Theodore Tso
2007-07-29 8:54 ` David Kastrup
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=7vk5tle4wq.fsf@assigned-by-dhcp.cox.net \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sam.vilain@catalyst.net.nz \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.