diff --follow: do not waste cycles while recursing
[gitweb.git] / builtin / merge-ours.c
2010-03-24 Merge branch 'maint'
2010-03-22 Sync with Git 1.7.0.3
2010-03-20 Merge branch 'jk/maint-add-ignored-dir'
2010-03-20 Merge branch 'ml/color-grep'
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-20 Merge branch 'cc/reset-keep'
2010-03-20 Merge branch 'fl/askpass'
2010-03-20 Merge branch 'bg/apply-fix-blank-at-eof'
2010-03-20 Merge branch 'bw/union-merge-refactor'
2010-03-20 Merge branch 'maint'
2010-03-17 Merge branch 'maint'
2010-03-17 Merge branch 'maint'
2010-03-15 Merge branch 'sd/format-patch-to'
2010-03-15 Merge branch 'tc/http-cleanup'
2010-03-15 Merge branch 'tc/transport-verbosity'
2010-03-15 Merge branch 'ld/push-porcelain'
2010-03-15 Merge branch 'jh/notes'
2010-03-14 Merge branch 'maint'
2010-03-13 Merge branch 'maint'
2010-03-10 Merge branch 'sd/init-template'
2010-03-10 Merge branch 'sh/am-keep-cr'
2010-03-10 Merge branch 'cp/add-u-pathspec'
2010-03-10 Merge branch 'lt/deepen-builtin-source'
2010-02-22 Move 'builtin-*' into a 'builtin/' subdirectory