Merge branch 'rr/triangle'
[gitweb.git] / merge.c
2012-11-15 Merge branch 'jk/maint-diff-grep-textconv'
2012-11-15 Merge branch 'jh/symbolic-ref-d'
2012-11-15 Merge branch 'jc/maint-fetch-tighten-refname-check'
2012-11-09 Merge branch 'ph/maint-submodule-status-fix'
2012-11-09 Merge branch 'nd/builtin-to-libgit'
2012-10-29 Move try_merge_command and checkout_fast_forward to...