Merge branch 'tl/anno'

Junio C Hamano · Junio C Hamano · commit 8bc63c9ad43a · 2006-03-03T22:29:17.000-08:00
* tl/anno:
  annotate should number lines starting with 1
diff --git a/git-annotate.perl b/git-annotate.perl
@@ -128,7 +128,7 @@ ()
 	}
 
 	printf("%s\t(%10s\t%10s\t%d)%s\n", $rev, $committer,
-		format_date($date), $i++, $output);
+		format_date($date), ++$i, $output);
 }
 
 sub init_claim {

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ ()`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`printf("%s\t(%10s\t%10s\t%d)%s\n", $rev, $committer,`
`131`		`- format_date($date), $i++, $output);`
	`131`	`+ format_date($date), ++$i, $output);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`sub init_claim {`