git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/4] difftool--helper: Update copyright and remove distracting comments

From
David Aguilar <davvid@gmail.com>
Date
Jan 10, 2010, 04:02 UTC
Message-ID
<1263096163-15743-1-git-send-email-davvid@gmail.com>

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: David Aguilar
Message 1 of 4 in “difftool--helper: Update copyright and remove distracting comments”
  1. 1/4 difftool--helper: Update copyright and remove distracting commentsDavid Aguilar, Jan 10, 2010
  2. 2/4 difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar, Jan 10, 2010
  3. 3/4 difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar, Jan 10, 2010
  4. 4/4 git-diff.txt: Link to git-difftoolDavid Aguilar, Jan 10, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.