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

[PATCH v3 1/4] mergetool: add copyright

From
David Aguilar <davvid@gmail.com>
Date
Oct 7, 2016, 23:58 UTC
Message-ID
<20161007235806.22247-1-davvid@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Unchanged since v1; included for completeness.
 git-mergetool.sh | 1 +
 1 file changed, 1 insertion(+)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index bf86270..300ce7f 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -3,6 +3,7 @@
 # This program resolves merge conflicts in git
 #
 # Copyright (c) 2006 Theodore Y. Ts'o
+# Copyright (c) 2009-2016 David Aguilar
 #
 # This file is licensed under the GPL v2, or a later version
 # at the discretion of Junio C Hamano.

-- 
2.10.1.386.g8ee99a0
Next: David Aguilar
Message 1 of 4 in “mergetool: add copyright”
  1. 1/4 mergetool: add copyrightDavid Aguilar, Oct 7, 2016
  2. 2/4 mergetool: move main program flow into a main() functionDavid Aguilar, Oct 7, 2016
  3. 3/4 mergetool: honor diff.orderFileDavid Aguilar, Oct 7, 2016
  4. 4/4 mergetool: honor -O<orderfile>David Aguilar, Oct 7, 2016

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.