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

Re: [PATCH 0/2] Fix handling of merges in git-annotate

From
RARyan Anderson <ryan@michonline.com>
Date
Jul 4, 2006, 01:34 UTC
Message-ID
<44A9C5AB.1020604@michonline.com>
In-Reply-To
<11519766021208-git-send-email-ryan@michonline.com>
Ryan Anderson wrote:
Show 5 quoted lines
> This 2-patch series is a major overhaul to the way git-annotate calculates the blame for each line.
>
> Instead of parsing each diff in reverse, this uses the output from "git
> diff-tree --combined", so that merges can be handled sanely.
>   
I forgot:
Please pull from http://h4x0r5.com/~ryan/git/ryan.git annotate-upstream
-- 
Ryan Anderson
  sometimes Pug Majere
Previous: Junio C Hamano
Message 6 of 6 in “Fix handling of merges in git-annotate”
  1. 0/2 Fix handling of merges in git-annotateRyan Anderson, Jul 4, 2006
  2. 1/2 annotate: Support annotation of files on other revisions.Ryan Anderson, Jul 4, 2006
  3. 2/2 annotate: Correct most merge following to annotate correctly.Ryan Anderson, Jul 4, 2006
  4. t8001-annotate: fix a bash-ism in this testEric Wong, Jul 4, 2006
  5. Junio C HamanoJul 4, 2006
  6. Ryan AndersonJul 4, 2006

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.