Merge branch 'fc/remote-helpers-test-updates'
[git] / builtin / merge-tree.c
2013-04-07  Junio C HamanoMerge branch 'jk/diffcore-break-divzero'
2013-04-07  Junio C HamanoMerge branch 'jk/bisect-prn-unsigned'
2013-04-07  Junio C HamanoMerge branch 'jk/filter-branch-come-back-to-original'
2013-04-05  Junio C HamanoMerge branch 'jl/submodule-deinit'
2013-04-05  Junio C HamanoMerge branch 'jc/merge-tag-object'
2013-04-04  Junio C HamanoMerge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04  Junio C HamanoMerge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04  Junio C HamanoMerge branch 'jk/peel-ref' into maint
2013-04-03  Junio C HamanoMerge branch 'js/iterm-is-on-osx'
2013-04-03  Junio C HamanoMerge branch 'jk/check-corrupt-objects-carefully'
2013-04-03  Junio C HamanoMerge branch 'jc/apply-ws-fix-tab-in-indent'
2013-04-03  Junio C HamanoMerge branch 'jc/directory-attrs-regression-fix'
2013-04-03  Junio C HamanoMerge branch 'nd/checkout-paths-reduce-match-pathspec...
2013-04-03  Junio C HamanoMerge branch 'mg/gpg-interface-using-status' into maint
2013-04-03  Junio C HamanoMerge branch 'bc/commit-complete-lines-given-via-m...
2013-04-03  Junio C HamanoMerge branch 'jc/describe' into maint
2013-04-03  Junio C HamanoMerge branch 'jk/alias-in-bare' into maint
2013-04-03  Junio C HamanoMerge branch 'ks/rfc2047-one-char-at-a-time' into maint
2013-04-03  Junio C HamanoMerge branch 'jk/empty-archive' into maint
2013-04-03  Junio C HamanoMerge branch 'ph/tag-force-no-warn-on-creation' into...
2013-04-03  Junio C HamanoMerge branch 'lf/setup-prefix-pathspec' into maint
2013-04-03  Junio C HamanoMerge branch 'kb/name-hash' into maint-1.8.1
2013-04-03  Junio C HamanoMerge branch 'kk/revwalk-slop-too-many-commit-within...
2013-04-03  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03  Junio C HamanoMerge branch 'jk/fully-peeled-packed-ref' into maint...
2013-04-03  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03  Junio C HamanoMerge branch 'yd/doc-merge-annotated-tag' into maint...
2013-04-03  Junio C HamanoMerge branch 'ap/maint-update-index-h-is-for-help'...
2013-04-03  Junio C HamanoMerge branch 'jc/perl-cat-blob' into maint-1.8.1
2013-04-03  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-03  Junio C HamanoMerge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-04-02  Junio C HamanoMerge branch 'js/log-gpg'
2013-04-02  Junio C HamanoMerge branch 'tb/cygwin-shared-repository'
2013-04-02  Junio C HamanoMerge branch 'sw/safe-create-leading-dir-race'
2013-04-02  Junio C HamanoMerge branch 'bk/document-commit-tree-S'
2013-04-02  Junio C HamanoMerge branch 'jk/no-more-self-assignment'
2013-04-01  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-01  Junio C HamanoMerge branch 'rr/tests-dedup-test-config' into maint
2013-04-01  Junio C HamanoMerge branch 'yd/doc-is-in-asciidoc' into maint
2013-04-01  Junio C HamanoMerge branch 'yd/doc-merge-annotated-tag' into maint
2013-04-01  Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint
2013-04-01  Junio C HamanoMerge branch 'da/downcase-u-in-usage' into maint
2013-04-01  Junio C HamanoMerge branch 'nd/index-pack-threaded-fixes'
2013-04-01  Junio C HamanoMerge branch 'jk/index-pack-correct-depth-fix'
2013-04-01  Junio C HamanoMerge branch 'jn/push-tests'
2013-04-01  Junio C HamanoMerge branch 'nd/branch-show-rebase-bisect-state'
2013-04-01  Junio C HamanoMerge branch 'jc/nobody-sets-src-peer-ref'
2013-04-01  Junio C HamanoMerge branch 'jc/remove-export-from-config-mak-in'
2013-04-01  Junio C HamanoMerge branch 'kb/name-hash'
2013-04-01  Junio C HamanoMerge branch 'jk/common-make-variables-export-safety'
2013-04-01  Junio C HamanoMerge branch 'jk/pkt-line-cleanup'
2013-04-01  Junio C HamanoMerge branch 'bc/append-signed-off-by'
2013-04-01  Junio C HamanoMerge branch 'sr/am-show-final-message-in-applying...
2013-04-01  Junio C HamanoMerge branch 'rr/test-3200-style'
2013-03-28  Junio C HamanoMerge branch 'yd/use-test-config-unconfig'
2013-03-28  Junio C HamanoMerge branch 'kk/revwalk-slop-too-many-commit-within...
2013-03-28  Junio C HamanoMerge branch 'rr/tests-dedup-test-config'
2013-03-28  Junio C HamanoMerge branch 'yd/doc-is-in-asciidoc'
2013-03-28  Junio C HamanoMerge branch 'yd/doc-merge-annotated-tag'
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup'
2013-03-28  Junio C HamanoMerge branch 'jk/difftool-dir-diff-edit-fix'
2013-03-27  Junio C HamanoMerge branch 'maint'
2013-03-27  Junio C HamanoMerge branch 'maint-1.8.1' into maint
2013-03-27  John Keepingmerge-tree: fix typo in merge-tree.c::unresolved
2013-03-26  Junio C HamanoMerge branch 'jc/reflog-reverse-walk'
2013-03-26  Junio C HamanoMerge branch 'jk/utf-8-can-be-spelled-differently'...
2013-03-26  Junio C HamanoMerge branch 'jc/perl-cat-blob' into maint
2013-03-26  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-03-26  Junio C HamanoMerge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-03-26  Junio C HamanoMerge branch 'jc/maint-push-refspec-default-doc' into...
2013-03-25  Junio C HamanoMerge branch 'jk/fully-peeled-packed-ref'
2013-03-25  Junio C HamanoMerge branch 'jk/peel-ref'
2013-03-25  Junio C HamanoMerge branch 'lf/setup-prefix-pathspec'
2013-03-25  Junio C HamanoMerge branch 'jk/suppress-clang-warning'
2013-03-25  Junio C HamanoMerge branch 'ks/rfc2047-one-char-at-a-time'
2013-03-25  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-25  Junio C HamanoMerge branch 'jl/submodule-deinit'
2013-03-25  Junio C HamanoMerge branch 'lf/bundle-verify-list-prereqs' into maint...
2013-03-25  Junio C HamanoMerge branch 'tk/doc-filter-branch' into maint-1.8.1
2013-03-25  Junio C HamanoMerge branch 'dm/ni-maxhost-may-be-missing' into maint...
2013-03-25  Junio C HamanoMerge branch 'jc/color-diff-doc' into maint-1.8.1
2013-03-21  Junio C HamanoMerge branch 'tz/credential-authinfo'
2013-03-21  Junio C HamanoMerge branch 'jk/utf-8-can-be-spelled-differently'
2013-03-21  Junio C HamanoMerge branch 'rt/commit-cleanup-config'
2013-03-21  Junio C HamanoMerge branch 'jc/perl-cat-blob'
2013-03-21  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify'
2013-03-21  Junio C HamanoMerge branch 'nd/index-pack-l10n-buf-overflow'
2013-03-21  Junio C HamanoMerge branch 'tb/document-status-u-tradeoff'
2013-03-21  Junio C HamanoMerge branch 'jc/maint-push-refspec-default-doc'
2013-03-19  Junio C HamanoMerge branch 'lf/bundle-verify-list-prereqs'
2013-03-19  Junio C HamanoMerge branch 'tk/doc-filter-branch'
2013-03-19  Junio C HamanoMerge branch 'dm/ni-maxhost-may-be-missing'
2013-03-19  Junio C HamanoMerge branch 'jc/color-diff-doc'
2013-03-13  Junio C HamanoMerge branch 'jc/reflog-reverse-walk' into nd/branch...
2013-03-11  Junio C HamanoMerge branch 'mp/complete-paths'
2013-03-07  Junio C HamanoMerge branch 'mp/complete-paths'
2013-03-07  Junio C HamanoMerge branch 'mh/maint-ceil-absolute' into maint
2013-02-27  Junio C HamanoMerge branch 'wk/man-deny-current-branch-is-default...
2013-02-27  Junio C HamanoMerge branch 'jn/less-reconfigure' into maint
next