Fix earlier mismerges.
[gitweb.git] / Documentation / git-annotate.txt
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-20 Stop carrying Geert's similarity estimator.
2006-04-18 Merge branch 'jc/pager-cat'
2006-04-18 Merge branch 'lt/logopt'
2006-04-18 Merge branch 'master' into next
2006-04-18 Add git-annotate(1) and git-blame(1)