From: John Keeping <john@keeping.me.uk>
To: git@vger.kernel.org
Cc: David Aguilar <davvid@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 1/3] fixup! mergetool--lib: add functions for finding available tools
Date: Wed, 30 Jan 2013 19:55:44 +0000 [thread overview]
Message-ID: <2c7dec096455e6e43d2e9aa28668f69a26f3d5f9.1359575447.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1359575447.git.john@keeping.me.uk>
In-Reply-To: <cover.1359575447.git.john@keeping.me.uk>
Signed-off-by: John Keeping <john@keeping.me.uk>
---
git-mergetool--lib.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 25631cd..b6ed2fa 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -34,9 +34,9 @@ show_tool_names () {
then
echo "$preamble"
preamble=
- shown_any=yes
fi
- printf "%s%s\n" "$per_line_prefix" "$tool"
+ shown_any=yes
+ printf "%s%s\n" "$per_line_prefix" "$toolname"
fi
done
test -n "$shown_any"
@@ -244,6 +244,7 @@ show_tool_help () {
tab=' ' av_shown= unav_shown=
+ cmd_name=${TOOL_MODE}tool
if show_tool_names 'mode_ok && is_available' "$tab$tab" \
"$tool_opt may be set to one of the following:"
then
--
1.8.1.1
next prev parent reply other threads:[~2013-01-30 19:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-30 19:55 [PATCH 0/3] mergetool: add user configured commands to '--tool-help' John Keeping
2013-01-30 19:55 ` John Keeping [this message]
2013-01-30 20:23 ` [PATCH 1/3] fixup! mergetool--lib: add functions for finding available tools Junio C Hamano
2013-01-30 20:34 ` John Keeping
2013-01-30 19:55 ` [PATCH 2/3] fixup! doc: generate a list of valid merge tools John Keeping
2013-01-30 19:55 ` [PATCH 3/3] mergetool--lib: list user configured tools in '--tool-help' John Keeping
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=2c7dec096455e6e43d2e9aa28668f69a26f3d5f9.1359575447.git.john@keeping.me.uk \
--to=john@keeping.me.uk \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).