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

Re: [PATCH 3/3] mergetool-lib: add diffuse as merge and diff tool

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 2, 2009, 18:06 UTC
Message-ID
<7vhc17exrk.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20090402104252.GA29223@gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 8 quoted lines
> git-send-email (probably gmail, too) won't let me send
> one patch in a series with a different "From:" header,
> so maybe you should resend this patch so that you can get the
> proper authorship recognition?  I've attached the original
> patch file I sent in case you want to just grab it and
> send-email it back out for the purposes of getting the right
> authorship in there (actually, Junio, please advise...,
> I'm not exactly sure what you'd prefer)

The way you marked your 3/3 with a From: line in the body of the message is the preferred way to say "David forwards a patch from Sebastian", and our patch application tool knows about it.

If you wanted to preserve the original author date, you could have also added a Date: line in-body ("David forwards a patch from Sebastian, who created it at this date in this timezone"). You can find an earlier example in:

    http://article.gmane.org/gmane.comp.version-control.git/115289
Previous: David AguilarNext: Markus Heidelberg
Message 5 of 7 in “mergetool-lib: specialize kdiff3 options when in diff mode”
  1. 1/3 mergetool-lib: specialize kdiff3 options when in diff modeDavid Aguilar, Apr 2, 2009
  2. 2/3 mergetool-lib: specialize xxdiff options when in diff modeDavid Aguilar, Apr 2, 2009
  3. 3/3 mergetool-lib: add diffuse as merge and diff toolDavid Aguilar, Apr 2, 2009
  4. David AguilarApr 2, 2009
  5. Junio C HamanoApr 2, 2009
  6. Markus HeidelbergApr 2, 2009
  7. David AguilarApr 3, 2009

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.