Merge branch 'bw/clone-ref-prefixes'
[git] / builtin / merge-recursive.c
2018-08-15  Junio C HamanoMerge branch 'bw/clone-ref-prefixes'
2018-08-15  Junio C HamanoMerge branch 'jk/core-use-replace-refs'
2018-08-15  Junio C HamanoMerge branch 'jh/json-writer'
2018-08-15  Junio C HamanoMerge branch 'bb/make-developer-pedantic'
2018-08-15  Junio C HamanoMerge branch 'es/diff-color-moved-fix'
2018-08-15  Junio C HamanoMerge branch 'bw/protocol-v2'
2018-08-15  Junio C HamanoMerge branch 'sg/travis-cocci-diagnose-failure'
2018-08-15  Junio C HamanoMerge branch 'js/t7406-recursive-submodule-update-order...
2018-08-15  Junio C HamanoMerge branch 'bw/fetch-pack-i18n'
2018-08-15  Junio C HamanoMerge branch 'sg/fast-import-dump-refs-on-checkpoint...
2018-08-15  Junio C HamanoMerge branch 'sb/trailers-docfix'
2018-08-15  Junio C HamanoMerge branch 'jk/ui-color-always-to-auto'
2018-08-02  Junio C HamanoMerge branch 'jt/commit-graph-per-object-store'
2018-08-02  Junio C HamanoMerge branch 'es/chain-lint-in-subshell'
2018-08-02  Junio C HamanoMerge branch 'jt/tags-to-promised-blobs-fix'
2018-08-02  Junio C HamanoMerge branch 'jt/fetch-negotiator-skipping'
2018-08-02  Junio C HamanoMerge branch 'jm/send-email-tls-auth-on-batch'
2018-08-02  Junio C HamanoMerge branch 'bc/sequencer-export-work-tree-as-well'
2018-08-02  Junio C HamanoMerge branch 'en/t7405-recursive-submodule-conflicts'
2018-08-02  Junio C HamanoMerge branch 'en/t6036-merge-recursive-tests'
2018-08-02  Junio C HamanoMerge branch 'en/dirty-merge-fixes'
2018-08-02  Junio C HamanoMerge branch 'js/rebase-merge-octopus'
2018-08-02  Junio C HamanoMerge branch 'tb/grep-only-matching'
2018-08-02  Junio C HamanoMerge branch 'kg/gc-auto-windows-workaround'
2018-08-02  Junio C HamanoMerge branch 'jm/cache-entry-from-mem-pool'
2018-08-02  Junio C HamanoMerge branch 'jt/fetch-nego-tip'
2018-08-02  Junio C HamanoMerge branch 'en/t6042-insane-merge-rename-testcases'
2018-08-02  Junio C HamanoMerge branch 'sb/object-store-lookup'
2018-08-02  Junio C HamanoMerge branch 'is/parsing-line-range'
2018-08-02  Junio C HamanoMerge branch 'jt/fetch-pack-negotiator'
2018-08-02  Junio C HamanoMerge branch 'ab/checkout-default-remote'
2018-08-02  Junio C HamanoMerge branch 'sb/diff-color-move-more'
2018-08-02  Junio C HamanoMerge branch 'es/test-fixes'
2018-08-02  Junio C HamanoMerge branch 'ds/commit-graph-fsck'
2018-08-02  Junio C HamanoMerge branch 'jk/fsck-gitmodules-gently'
2018-08-02  Junio C HamanoMerge branch 'bc/object-id'
2018-07-16  brian m. carlsonbuiltin/merge-recursive: make hash independent
2018-05-30  Junio C HamanoMerge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-04-25  Junio C HamanoMerge branch 'js/t5404-path-fix'
2018-04-25  Junio C HamanoMerge branch 'mn/send-email-credential-doc'
2018-04-25  Junio C HamanoMerge branch 'ak/bisect-doc-typofix'
2018-03-22  Junio C HamanoMerge branch 'sb/status-doc-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'cl/t9001-cleanup' into maint
2018-03-22  Junio C HamanoMerge branch 'nd/diff-flush-before-warning' into maint
2018-03-21  Junio C HamanoMerge branch 'dp/merge-strategy-doc-fix'
2018-03-08  Junio C HamanoMerge branch 'mk/doc-pretty-fill'
2018-03-06  Junio C HamanoMerge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02  Junio C HamanoMerge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02  Junio C HamanoMerge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-02-28  Junio C HamanoMerge branch 'tz/do-not-clean-spec-file'
2018-02-28  Junio C HamanoMerge branch 'sb/status-doc-fix'
2018-02-27  Junio C HamanoMerge branch 'bp/name-hash-dirname-fix'
2018-02-15  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-13  Junio C HamanoMerge branch 'nd/diff-flush-before-warning'
2018-02-13  Junio C HamanoMerge branch 'cl/t9001-cleanup'
2018-01-23  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix'
2018-01-09  Junio C HamanoMerge branch 'js/misc-git-gui-stuff' of ../git-gui
2017-12-28  Junio C HamanoMerge branch 'sr/http-sslverify-config-doc'
2017-12-27  Junio C HamanoMerge branch 'es/clone-shared-worktree'
2017-12-27  Junio C HamanoMerge branch 'jk/cvsimport-quoting'
2017-12-27  Junio C HamanoMerge branch 'rs/am-builtin-leakfix'
2017-12-05  Junio C HamanoMerge branch 'ls/no-double-utf8-author-name' of .....
2017-11-22  Junio C HamanoMerge branch 'jn/reproducible-build' of ../git-gui...
2017-11-09  Junio C HamanoMerge branch 'tz/fsf-address-update' of ../git-gui...
2017-11-06  Junio C HamanoMerge branch 'ex/deprecate-empty-pathspec-as-match...
2017-10-28  Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-10-23  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-19  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update'
2017-10-18  Junio C HamanoMerge branch 'ma/pkt-line-leakfix' into maint
2017-10-18  Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix' into maint
2017-10-18  Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix' into maint
2017-09-28  Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix'
2017-09-28  Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix'
2017-09-25  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-22  Junio C HamanoSync with 2.10.5
2017-09-22  Junio C HamanoMerge branch 'jk/safe-pipe-capture' into maint-2.10
2017-09-22  Junio C HamanoMerge branch 'jk/cvsimport-quoting' into maint-2.10
2017-09-22  Junio C HamanoMerge branch 'jc/cvsserver' into maint-2.10
2017-09-22  Junio C HamanoMerge branch 'jk/git-shell-drop-cvsserver' into maint...
2017-09-19  Junio C HamanoMerge branch 'ma/pkt-line-leakfix'
2017-09-10  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix' into maint
2017-09-10  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection' into maint
2017-09-10  Junio C HamanoMerge branch 'rj/add-chmod-error-message' into maint
2017-09-10  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t4062-obsd' into maint
2017-08-27  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix'
2017-08-27  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup'
2017-08-23  Junio C HamanoMerge branch 'js/run-process-parallel-api-fix' into...
2017-08-23  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum'
2017-08-22  Junio C HamanoMerge branch 'rs/t4062-obsd'
2017-08-22  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection'
2017-08-22  Junio C HamanoMerge branch 'rj/add-chmod-error-message'
2017-08-22  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix'
2017-08-11  Junio C HamanoMerge branch 'js/run-process-parallel-api-fix'
2017-08-04  Junio C HamanoMerge branch 'ah/patch-id-doc'
next