Merge branch 'rs/pull-leakfix'
[git] / builtin / merge-index.c
2019-03-11  Junio C HamanoMerge branch 'rd/attr.c-comment-typofix'
2019-03-11  Junio C HamanoMerge branch 'yb/utf-16le-bom-spellfix'
2019-03-07  Junio C HamanoMerge branch 'jk/diff-no-index-initialize'
2019-03-07  Junio C HamanoMerge branch 'rd/doc-hook-used-in-sample'
2019-03-07  Junio C HamanoMerge branch 'nd/diff-parseopt-2'
2019-03-07  Junio C HamanoMerge branch 'en/merge-options-doc'
2019-03-07  Junio C HamanoMerge branch 'ab/receive-pack-use-after-free-fix'
2019-03-07  Junio C HamanoMerge branch 'js/doc-symref-in-proto-v1'
2019-03-07  Junio C HamanoMerge branch 'nd/split-index-null-base-fix'
2019-03-07  Junio C HamanoMerge branch 'rj/prune-packed-excess-args'
2019-03-07  Junio C HamanoMerge branch 'en/combined-all-paths'
2019-03-07  Junio C HamanoMerge branch 'sc/pack-redundant'
2019-03-07  Junio C HamanoMerge branch 'du/branch-show-current'
2019-03-07  Junio C HamanoMerge branch 'dl/complete-submodule-absorbgitdirs'
2019-03-07  Junio C HamanoMerge branch 'wh/author-committer-ident-config'
2019-03-07  Junio C HamanoMerge branch 'aw/pretty-trailers'
2019-03-07  Junio C HamanoMerge branch 'nd/diff-parseopt'
2019-03-07  Junio C HamanoMerge branch 'tg/checkout-no-overlay'
2019-02-24  Junio C HamanoMerge branch 'yn/checkout-doc-fix'
2019-02-23  Junio C HamanoMerge branch 'ab/workaround-dash-bug-in-test'
2019-02-14  Junio C HamanoMerge branch 'ea/rebase-compat-doc-fix'
2019-02-14  Junio C HamanoMerge branch 'jc/no-grepping-for-strerror-in-tests'
2019-02-14  Junio C HamanoMerge branch 'jt/fetch-v2-sideband'
2019-02-14  Junio C HamanoMerge branch 'en/rebase-merge-on-sequencer'
2019-02-14  Junio C HamanoMerge branch 'js/mingw-host-cpu'
2019-02-14  Junio C HamanoMerge branch 'sg/stress-test'
2019-02-14  Junio C HamanoMerge branch 'kd/t0028-octal-del-is-377-not-777'
2019-02-14  Junio C HamanoMerge branch 'nd/fileno-may-be-macro'
2019-02-14  Junio C HamanoMerge branch 'rj/sequencer-sign-off-header-static'
2019-02-12  Junio C HamanoMerge branch 'nd/imap-send-typofix'
2019-02-09  Jiang XinMerge branch 'master' of git://github.com/git-l10n...
2019-02-09  Junio C HamanoMerge branch 'js/mingw-host-cpu'
2019-02-09  Junio C HamanoMerge branch 'kl/pretty-doc-markup-fix'
2019-02-09  Junio C HamanoMerge branch 'ld/git-p4-remove-flakey-test'
2019-02-09  Junio C HamanoMerge branch 'js/rebase-i-redo-exec-fix'
2019-02-09  Junio C HamanoMerge branch 'nd/checkout-noisy-unmerge'
2019-02-09  Junio C HamanoMerge branch 'js/smart-http-detect-remote-error'
2019-02-09  Junio C HamanoMerge branch 'ds/coverage-prove'
2019-02-09  Junio C HamanoMerge branch 'tz/gpg-test-fix'
2019-02-09  Junio C HamanoMerge branch 'os/rebase-runs-post-checkout-hook'
2019-02-07  Junio C HamanoMerge branch 'jk/add-ignore-errors-bit-assignment-fix'
2019-02-07  Junio C HamanoMerge branch 'rj/sparse-flags'
2019-02-07  Junio C HamanoMerge branch 'bc/fetch-pack-clear-alternate-shallow'
2019-02-07  Junio C HamanoMerge branch 'ma/doc-diff-usage-fix'
2019-02-07  Junio C HamanoMerge branch 'ab/diff-tree-doc-fix'
2019-02-07  Junio C HamanoMerge branch 'ss/describe-dirty-in-the-right-directory'
2019-02-07  Junio C HamanoMerge branch 'sg/travis-osx-brew-breakage-workaround'
2019-02-07  Junio C HamanoMerge branch 'nd/commit-doc'
2019-02-07  Junio C HamanoMerge branch 'sl/const'
2019-02-07  Junio C HamanoMerge branch 'sh/submodule-summary-abbrev-fix'
2019-02-07  Junio C HamanoMerge branch 'nd/help-align-command-desc'
2019-02-07  Junio C HamanoMerge branch 'jk/loose-object-cache-oid'
2019-02-07  Junio C HamanoMerge branch 'pw/rebase-x-sanity-check'
2019-02-07  Junio C HamanoMerge branch 'js/vsts-ci'
2019-02-07  Junio C HamanoMerge branch 'br/commit-tree-fully-spelled-gpg-sign...
2019-02-07  Junio C HamanoMerge branch 'sb/submodule-abort-update-upon-config...
2019-02-07  Junio C HamanoMerge branch 'sg/travis-specific-cc'
2019-02-07  Junio C HamanoMerge branch 'ds/push-sparse-tree-walk'
2019-02-07  Junio C HamanoMerge branch 'tb/test-lint-sed-options'
2019-02-07  Junio C HamanoMerge branch 'lt/date-human'
2019-02-07  Junio C HamanoMerge branch 'jk/autocrlf-overrides-eol-doc'
2019-02-07  Junio C HamanoMerge branch 'jk/unused-parameter-cleanup'
2019-02-07  Junio C HamanoMerge branch 'nd/the-index-final'
2019-02-05  Junio C HamanoMerge branch 'cc/test-ref-store-typofix'
2019-01-24  Nguyễn Thái Ngọc Duycache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2018-11-21  Junio C HamanoMerge branch 'jk/check-everything-connected-is-long...
2018-10-31  Junio C HamanoAdjust for 2.19.x series
2018-10-16  Junio C HamanoMerge branch 'jk/check-everything-connected-is-long...
2018-08-27  Junio C HamanoMerge branch 'sg/t7501-thinkofix'
2018-08-27  Junio C HamanoMerge branch 'sg/t0020-conversion-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t4051-fix'
2018-08-20  Junio C HamanoMerge branch 'js/typofixes'
2018-08-15  Junio C HamanoMerge branch 'sb/histogram-less-memory'
2018-07-24  Junio C HamanoMerge branch 'jk/fetch-all-peeled-fix'
2018-06-28  Junio C HamanoMerge branch 'jk/fetch-all-peeled-fix'
2018-06-18  Junio C HamanoMerge branch 'mw/doc-merge-enumfix'
2018-05-30  Junio C HamanoMerge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-08  Junio C HamanoMerge branch 'ab/git-svn-get-record-typofix'
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-04-10  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-03-22  Junio C HamanoMerge branch 'gs/test-unset-xdg-cache-home' into maint
2018-03-22  Junio C HamanoMerge branch 'sb/status-doc-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'...
2018-03-22  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-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-08  Junio C HamanoMerge branch 'ds/mark-parents-uninteresting-optim'
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 'gs/test-unset-xdg-cache-home'
2018-02-28  Junio C HamanoMerge branch 'sb/status-doc-fix'
2018-02-27  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-02-27  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'
2018-02-27  Junio C HamanoMerge branch 'bp/name-hash-dirname-fix'
next