checkout: use --aggressive when running a 3-way merge (-m).
[gitweb.git] / log-tree.h
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-12 Merge branch 'jc/combine' into next
2006-04-11 Merge branch 'jc/combine' into next
2006-04-11 Merge branch 'ds/index' into next
2006-04-11 Merge branch 'jc/withraw' into next
2006-04-11 Merge branch 'eb/apply' into next
2006-04-11 Merge branch 'jc/withraw' into next
2006-04-10 Merge branch 'master' into jc/diff
2006-04-09 Merge branch 'jc/diff' into next
2006-04-09 log-tree: separate major part of diff-tree.