Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree
[git] / builtin / merge.c
2012-07-17  Junio C HamanoMerge branch 'kk/maint-1.7.9-commit-tree' into kk/maint...
2012-06-17  Junio C HamanoSync with 1.7.10.5
2012-06-17  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' into...
2012-06-15  Junio C HamanoMerge branch 'as/diff-shortstat-ignore-binary'
2012-06-13  Junio C HamanoMerge branch 'rj/gitweb-test-sans-date-parser'
2012-06-13  Junio C HamanoMerge branch 'fc/git-complete-helper-fix'
2012-06-12  Junio C HamanoMerge branch 'mm/api-credentials-doc'
2012-06-12  Junio C HamanoMerge branch 'jc/fmt-merge-msg-people'
2012-06-12  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error'
2012-06-08  Junio C HamanoMerge branch 'mm/api-credentials-doc'
2012-06-07  Junio C HamanoMerge branch 'mm/api-credentials-doc'
2012-06-07  Junio C HamanoMerge branch 'rr/maint-t3510-cascade-fix'
2012-06-07  Junio C HamanoMerge branch 'jc/svn-auth-providers-unusable-at-1.6.12'
2012-06-07  Junio C HamanoMerge branch 'cr/persistent-https'
2012-06-03  Junio C HamanoSync with 1.7.10.4
2012-06-03  Junio C HamanoMerge branch 'ef/maint-rebase-error-message' into maint
2012-06-01  Junio C HamanoMerge branch 'ef/maint-rebase-error-message'
2012-06-01  Junio C HamanoMerge branch 'nh/empty-rebase'
2012-06-01  Junio C HamanoMerge branch 'vr/rebase-autosquash-does-not-imply-i'
2012-06-01  Junio C HamanoMerge branch 'mm/levenstein-penalize-deletion-less'
2012-06-01  Junio C HamanoMerge branch 'jl/submodule-report-new-path-once'
2012-06-01  Junio C HamanoSync with maint
2012-06-01  Junio C HamanoMerge branch 'ef/http-o-depends-on-gvf' into maint
2012-06-01  Junio C HamanoMerge git://github.com/git-l10n/git-po
2012-06-01  Junio C HamanoMerge branch 'rs/maint-grep-F' into maint
2012-06-01  Junio C HamanoMerge branch 'jk/ident-split-fix' into maint
2012-06-01  Junio C HamanoMerge branch 'jk/pretty-commit-header-incomplete-line...
2012-06-01  Junio C HamanoMerge branch 'jk/format-person-part-buffer-limit' into...
2012-05-29  Junio C HamanoMerge git://bogomips.org/git-svn
2012-05-29  Junio C HamanoMerge branch 'va/git-p4-test'
2012-05-29  Junio C HamanoMerge branch 'jk/ident-gecos-strbuf'
2012-05-29  Junio C HamanoMerge branch 'mh/fetch-pack-constness'
2012-05-29  Junio C HamanoMerge branch 'mh/ref-api-lazy-loose'
2012-05-25  Junio C HamanoMerge branch 'sp/sh-windows-pwd'
2012-05-25  Junio C HamanoMerge branch 'mh/test-keep-prove-cache'
2012-05-25  Junio C HamanoMerge branch 'jk/format-person-part-buffer-limit'
2012-05-25  Junio C HamanoMerge branch 'jk/pretty-commit-header-incomplete-line'
2012-05-25  Junio C HamanoMerge branch 'jk/ident-split-fix'
2012-05-25  Junio C HamanoMerge branch 'rs/xdiff-fast-hash-fix'
2012-05-25  Junio C HamanoMerge branch 'mh/ref-api'
2012-05-25  Junio C HamanoMerge branch 'rs/maint-grep-F'
2012-05-25  Junio C HamanoMerge branch 'hv/submodule-alt-odb' into maint
2012-05-25  Junio C HamanoMerge branch 'bp/diff-no-index-strbuf-fix' into maint
2012-05-25  Jeff Kingident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT
2012-05-23  Junio C HamanoMerge branch 'rs/archive-tree-in-tip-simplify'
2012-05-23  Junio C HamanoMerge branch 'js/rev-parse-doc-fix'
2012-05-23  Junio C HamanoMerge branch 'js/rebase-i-p-test-fix'
2012-05-23  Junio C HamanoMerge branch 'bp/diff-no-index-strbuf-fix'
2012-05-23  Junio C HamanoMerge branch 'hv/submodule-alt-odb'
2012-05-17  Junio C HamanoMerge branch 'ld/git-p4-tags-and-labels'
2012-05-14  Junio C HamanoMerge branch 'nd/threaded-index-pack'
2012-05-14  Junio C HamanoMerge branch 'jk/maint-reflog-walk-count-vs-time' into...
2012-05-14  Junio C HamanoMerge branch 'jk/doc-asciidoc-inline-literal' into...
2012-05-14  Junio C HamanoMerge branch 'ef/checkout-empty' into maint
2012-05-14  Junio C HamanoMerge branch 'jk/maint-tformat-with-z' into maint
2012-05-14  Junio C HamanoMerge branch 'js/checkout-detach-count' into maint
2012-05-14  Junio C HamanoMerge branch 'ef/maint-clone-progress-fix' into maint
2012-05-11  Junio C HamanoMerge branch 'ef/checkout-empty'
2012-05-11  Junio C HamanoMerge branch 'jk/maint-reflog-walk-count-vs-time'
2012-05-11  Junio C HamanoMerge branch 'jc/diff-algo-cleanup' into maint
2012-05-11  Junio C HamanoMerge branch 'ct/advise-push-default' into maint
2012-05-11  Junio C HamanoMerge branch 'js/fast-import-test-9300' into maint
2012-05-11  Junio C HamanoMerge branch 'jk/repack-no-explode-objects-from-old...
2012-05-11  Junio C HamanoMerge branch 'ah/maint-grep-double-init' into maint
2012-05-11  Junio C HamanoMerge branch 'fa/maint-config-doc' into maint
2012-05-11  Junio C HamanoMerge branch 'rs/unpack-trees-leakfix' into maint
2012-05-11  Junio C HamanoMerge branch 'sl/test-wc-l-line-count' into maint
2012-05-11  Junio C HamanoMerge branch 'rl/show-empty-prefix' into maint
2012-05-10  Junio C HamanoMerge branch 'fa/maint-config-doc'
2012-05-10  Junio C HamanoMerge branch 'ef/maint-clone-progress-fix'
2012-05-10  Junio C HamanoMerge branch 'ah/maint-grep-double-init'
2012-05-10  Junio C HamanoMerge branch 'js/checkout-detach-count'
2012-05-10  Junio C HamanoMerge branch 'jc/install-no-hardlinks'
2012-05-10  Junio C HamanoMerge branch 'mh/ref-api-lazy-loose'
2012-05-10  Junio C HamanoMerge branch 'mm/include-userpath' into maint
2012-05-10  Junio C HamanoMerge branch 'cc/fix-missing-va-end-in-revert' into...
2012-05-10  Junio C HamanoMerge branch 'bw/test-fix-grep-gnuism' into maint
2012-05-10  Junio C HamanoMerge branch 'jk/http-backend-keep-committer-ident...
2012-05-10  Junio C HamanoMerge branch 'nl/rebase-i-cheat-sheet' into maint
2012-05-10  Junio C HamanoMerge branch 'bw/submodule-sed-solaris' into maint
2012-05-10  Junio C HamanoMerge branch 'jk/maint-push-progress' into maint
2012-05-10  Junio C HamanoMerge branch 'jc/rerere-train' into maint
2012-05-10  Junio C HamanoMerge branch 'lp/diffstat-with-graph' into maint
2012-05-08  Junio C HamanoMerge branch 'rs/maint-dir-strbuf' into rs/dir-strbuf
2012-05-07  Junio C HamanoMerge branch 'nh/empty-rebase'
2012-05-07  Junio C HamanoMerge branch 'jk/maint-tformat-with-z'
2012-05-07  Junio C HamanoMerge branch 'th/difftool-diffall'
2012-05-07  Junio C HamanoMerge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-07  Junio C HamanoMerge branch 'js/daemon-test-race-fix' into maint
2012-05-07  Junio C HamanoMerge branch 'jk/maint-config-bogus-section' into maint
2012-05-07  Junio C HamanoMerge branch 'pw/t5800-import-race-fix' into maint
2012-05-07  Junio C HamanoMerge branch 'rt/cherry-revert-conflict-summary' into...
2012-05-07  Junio C HamanoMerge branch 'cb/maint-report-mount-point-correctly...
2012-05-07  Junio C HamanoMerge branch 'ef/maint-1.7.6-clone-progress-fix' into...
2012-05-03  Junio C HamanoMerge branch 'jc/merge-reduce-parents-early' into maint
2012-05-03  Junio C HamanoMerge branch 'mb/fetch-call-a-non-branch-a-ref' into...
2012-05-03  Junio C HamanoMerge branch 'rl/maint-stash-i18n-save-error' into...
2012-05-03  Junio C HamanoMerge branch 'jm/maint-strncpy-diff-no-index' into...
2012-05-03  Junio C HamanoMerge branch 'jk/maint-push-progress'
2012-05-03  Junio C HamanoMerge branch 'nd/columns'
next