From: Ryan Anderson <ryan@michonline.com>
To: junkio@cox.net
Cc: git@vger.kernel.org
Subject: [PATCH 0/2] Fix handling of merges in git-annotate
Date: Mon, 03 Jul 2006 21:30:00 -0400 [thread overview]
Message-ID: <11519766021208-git-send-email-ryan@michonline.com> (raw)
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.
Ryan Anderson:
annotate: Support annotation of files on other revisions.
annotate: Correct most merge following to annotate correctly.
git-annotate.perl | 197 ++++++++++++++++++++++++++++++++++++---------------
t/t8001-annotate.sh | 6 ++
2 files changed, 145 insertions(+), 58 deletions(-)
next reply other threads:[~2006-07-04 1:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-04 1:30 Ryan Anderson [this message]
2006-07-04 1:30 ` [PATCH 1/2] annotate: Support annotation of files on other revisions Ryan Anderson
2006-07-04 1:30 ` [PATCH 2/2] annotate: Correct most merge following to annotate correctly Ryan Anderson
2006-07-04 8:04 ` [PATCH] t8001-annotate: fix a bash-ism in this test Eric Wong
2006-07-04 8:46 ` Junio C Hamano
2006-07-04 1:34 ` [PATCH 0/2] Fix handling of merges in git-annotate Ryan Anderson
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=11519766021208-git-send-email-ryan@michonline.com \
--to=ryan@michonline.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).