From: David Aguilar <davvid@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, markus.heidelberg@web.de
Subject: [PATCH 1/4] difftool--helper: Update copyright and remove distracting comments
Date: Sat, 9 Jan 2010 20:02:40 -0800 [thread overview]
Message-ID: <1263096163-15743-1-git-send-email-davvid@gmail.com> (raw)
Some of the comments in git-difftool--helper are not needed because
the code is sufficiently readable without them.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
git-difftool--helper.sh | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 57e8e32..1b13808 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -3,9 +3,8 @@
# This script is typically launched by using the 'git difftool'
# convenience command.
#
-# Copyright (c) 2009 David Aguilar
+# Copyright (c) 2009-2010 David Aguilar
-# Load common functions from git-mergetool--lib
TOOL_MODE=diff
. git-mergetool--lib
@@ -20,7 +19,6 @@ should_prompt () {
fi
}
-# Sets up shell variables and runs a merge tool
launch_merge_tool () {
# Merged is the filename as it appears in the work tree
# Local is the contents of a/filename
@@ -39,7 +37,6 @@ launch_merge_tool () {
read ans
fi
- # Run the appropriate merge tool command
run_merge_tool "$merge_tool"
}
--
1.6.6.4.g20a38b.dirty
next reply other threads:[~2010-01-10 4:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-10 4:02 David Aguilar [this message]
2010-01-10 4:02 ` [PATCH 2/4] difftool--helper: Remove use of the GIT_MERGE_TOOL variable David Aguilar
2010-01-10 4:02 ` [PATCH 3/4] difftool: Allow specifying unconfigured commands with --extcmd David Aguilar
2010-01-10 4:02 ` [PATCH 4/4] git-diff.txt: Link to git-difftool 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=1263096163-15743-1-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--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.
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).