Merge branch 'cn/commit-amend-doc' into maint
[git] / builtin / merge-index.c
2013-04-12  Junio C HamanoMerge branch 'cn/commit-amend-doc' into maint
2013-04-12  Junio C HamanoMerge branch 'jk/bisect-prn-unsigned' into maint
2013-04-12  Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint
2013-04-07  Junio C HamanoMerge branch 'jc/directory-attrs-regression-fix' into...
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 'ks/rfc2047-one-char-at-a-time' into maint
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 '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-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-merge-annotated-tag' into maint
2013-04-01  Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint
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 '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-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
2013-02-27  Junio C HamanoMerge branch 'mh/maint-ceil-absolute'
2013-02-25  Junio C HamanoMerge branch 'jn/less-reconfigure'
2013-02-25  Junio C HamanoMerge branch 'as/check-ignore'
2013-02-25  Junio C HamanoMerge branch 'ct/autoconf-htmldir'
2013-02-25  Junio C HamanoMerge branch 'wk/man-deny-current-branch-is-default...
2013-02-25  Junio C HamanoMerge branch 'jc/mention-tracking-for-pull-default...
2013-02-25  Junio C HamanoMerge branch 'da/p4merge-mktemp-fix' into maint
2013-02-25  Junio C HamanoMerge branch 'al/mergetool-printf-fix' into maint
2013-02-25  Junio C HamanoMerge branch 'jx/utf8-printf-width' into maint
2013-02-25  Junio C HamanoMerge branch 'mg/bisect-doc' into maint
2013-02-25  Junio C HamanoMerge branch 'sp/smart-http-content-type-check' into...
2013-02-25  Junio C HamanoMerge branch 'jc/combine-diff-many-parents' into maint
2013-02-25  Junio C HamanoMerge branch 'jk/apply-similaritly-parsing' into maint
2013-02-25  Junio C HamanoMerge branch 'jk/remote-helpers-doc' into maint
2013-02-25  Junio C HamanoMerge branch 'ab/gitweb-use-same-scheme' into maint
2013-02-25  Junio C HamanoMerge branch 'zk/clean-report-failure' into maint
2013-02-25  Junio C HamanoMerge branch 'nd/clone-no-separate-git-dir-with-bare...
2013-02-25  Junio C HamanoMerge branch 'da/p4merge-mktemp' into maint
2013-02-20  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-02-19  Junio C HamanoMerge branch 'jc/mention-tracking-for-pull-default'
2013-02-17  Junio C HamanoMerge branch 'jk/rebase-i-comment-char'
2013-02-15  Junio C HamanoMerge branch 'wk/man-deny-current-branch-is-default...
2013-02-15  Junio C HamanoMerge branch 'da/p4merge-mktemp-fix'
2013-02-14  Junio C HamanoMerge branch 'al/mergetool-printf-fix'
2013-02-14  Junio C HamanoMerge branch 'jk/error-const-return'
2013-02-14  Junio C HamanoMerge branch 'jx/utf8-printf-width'
2013-02-14  Junio C HamanoMerge branch 'mg/bisect-doc'
2013-02-14  Junio C HamanoMerge branch 'jc/extended-fake-ancestor-for-gitlink'
2013-02-14  Junio C HamanoMerge branch 'dg/subtree-fixes'
2013-02-11  Junio C HamanoMerge branch 'sp/smart-http-content-type-check'
2013-02-08  Junio C HamanoMerge branch 'jc/combine-diff-many-parents'
2013-02-08  Junio C HamanoMerge branch 'jk/apply-similaritly-parsing'
2013-02-08  Junio C HamanoMerge branch 'mk/tcsh-complete-only-known-paths'
2013-02-08  Junio C HamanoMerge branch 'mp/complete-paths'
2013-02-08  Junio C HamanoMerge branch 'ct/autoconf-htmldir'
2013-02-07  Junio C HamanoMerge branch 'mz/pick-unborn' into maint
2013-02-07  Junio C HamanoMerge branch 'nd/fix-perf-parameters-in-tests' into...
2013-02-07  Junio C HamanoMerge branch 'jc/do-not-let-random-file-interfere-with...
2013-02-07  Junio C HamanoMerge branch 'ft/transport-report-segv' into maint
2013-02-07  Junio C HamanoMerge branch 'sb/gpg-plug-fd-leak' into maint
2013-02-07  Junio C HamanoMerge branch 'jc/fake-ancestor-with-non-blobs' into...
2013-02-07  Junio C HamanoMerge branch 'jn/auto-depend-workaround-buggy-ccache...
2013-02-07  Junio C HamanoMerge branch 'da/mergetool-docs'
2013-02-07  Junio C HamanoMerge branch 'ss/mergetools-tortoise'
2013-02-07  Junio C HamanoMerge branch 'jk/mergetool'
2013-02-07  Junio C HamanoMerge branch 'jk/remote-helpers-doc'
2013-02-07  Junio C HamanoMerge branch 'sb/run-command-fd-error-reporting'
2013-02-07  Junio C HamanoMerge branch 'ab/gitweb-use-same-scheme'
2013-02-06  Junio C HamanoMerge branch 'jn/auto-depend-workaround-buggy-ccache'
2013-02-06  Junio C HamanoMerge branch 'jc/fake-ancestor-with-non-blobs'
2013-02-06  Junio C HamanoMerge branch 'sb/gpg-plug-fd-leak'
2013-02-06  Junio C HamanoMerge branch 'ft/transport-report-segv'
2013-02-04  Junio C HamanoMerge branch 'mm/add-u-A-sans-pathspec'
2013-02-04  Junio C HamanoMerge branch 'jc/push-reject-reasons'
2013-02-04  Junio C HamanoMerge branch 'jc/custom-comment-char'
2013-02-04  Junio C HamanoMerge branch 'bc/git-p4-for-python-2.4' into maint
2013-02-04  Junio C HamanoMerge branch 'nd/edit-branch-desc-while-detached' into...
2013-02-04  Junio C HamanoMerge branch 'jn/do-not-drop-username-when-reading...
2013-02-04  Junio C HamanoMerge branch 'jk/cvsimport-does-not-work-with-cvsps3...
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-02-04  Junio C HamanoMerge branch 'jc/help' into maint
2013-02-04  Junio C HamanoMerge branch 'jc/merge-blobs' into maint
2013-02-01  Junio C HamanoMerge branch 'nd/edit-branch-desc-while-detached'
2013-02-01  Junio C HamanoMerge branch 'jk/gc-auto-after-fetch'
next