Merge branch 'cr/cvsimport-local-zone'
[git] / merge.c
2012-11-15  Junio C HamanoMerge branch 'cr/cvsimport-local-zone'
2012-11-15  Junio C HamanoMerge branch 'jc/same-encoding'
2012-11-15  Junio C HamanoMerge branch 'ph/submodule-sync-recursive'
2012-11-15  Junio C HamanoMerge branch 'jk/maint-diff-grep-textconv'
2012-11-15  Junio C HamanoMerge branch 'jh/symbolic-ref-d'
2012-11-15  Junio C HamanoMerge branch 'jc/maint-fetch-tighten-refname-check'
2012-11-09  Jeff KingMerge branch 'ph/maint-submodule-status-fix'
2012-11-09  Jeff KingMerge branch 'nd/builtin-to-libgit'
2012-10-29  Nguyễn Thái Ngọc DuyMove try_merge_command and checkout_fast_forward to...