Merge branch 'ab/config-based-hooks-base' into seen
[git] / ll-merge.c
2021-06-19  Junio C HamanoMerge branch 'ab/config-based-hooks-base' into seen origin/seen
2021-06-19  Junio C HamanoMerge branch 'ab/serve-cleanup' into seen
2021-06-19  Junio C HamanoMerge branch 'js/stop-exporting-bogus-columns' into...
2021-06-19  Junio C HamanoMerge branch 'en/ort-perf-batch-13' into seen
2021-06-19  Junio C HamanoMerge branch 'es/superproject-aware-submodules' into...
2021-06-19  Junio C HamanoMerge branch 'ab/doc-retire-alice-bob' into seen
2021-06-19  Junio C HamanoMerge branch 'pw/diff-color-moved-fix' into seen
2021-06-19  Junio C HamanoMerge branch 'en/zdiff3' into seen
2021-06-19  Junio C HamanoMerge branch 'ab/pack-objects-stdin' into seen
2021-06-19  Junio C HamanoMerge branch 'dd/document-log-decorate-default' into...
2021-06-19  Junio C HamanoMerge branch 'ab/update-submitting-patches' into seen
2021-06-19  Junio C HamanoMerge branch 'ab/test-tool-cache-cleanup' into seen
2021-06-19  Junio C HamanoMerge branch 'ar/test-code-cleanup' into seen
2021-06-19  Junio C HamanoMerge branch 'ba/object-info' into seen
2021-06-19  Junio C HamanoMerge branch 'ab/progress-cleanup' into seen
2021-06-19  Junio C HamanoMerge branch 'ab/xdiff-bug-cleanup' into seen
2021-06-19  Junio C HamanoMerge branch 'ms/mergetools-kdiff3-on-windows' into...
2021-06-19  Junio C HamanoMerge branch 'ab/send-email-optim' into seen
2021-06-19  Junio C HamanoMerge branch 'ds/status-with-sparse-index' into seen
2021-06-19  Junio C HamanoMerge branch 'ao/p4-avoid-decoding' into seen
2021-06-19  Junio C HamanoMerge branch 'jh/builtin-fsmonitor' into seen
2021-06-19  Junio C HamanoMerge branch 'gh/gitweb-branch-sort' into seen
2021-06-19  Junio C HamanoMerge branch 'ab/cmd-foo-should-return' into seen
2021-06-19  Junio C HamanoMerge branch 'lh/systemd-timers' into seen
2021-06-19  Junio C HamanoMerge branch 'ar/doc-libera-chat-in-my-first-contrib...
2021-06-19  Junio C HamanoMerge branch 'ar/mailinfo-memcmp-to-skip-prefix' into...
2021-06-19  Junio C HamanoMerge branch 'en/ort-perf-batch-12' into seen
2021-06-19  Junio C HamanoMerge branch 'es/trace2-log-parent-process-name' into...
2021-06-19  Junio C HamanoMerge branch 'jk/doc-max-pack-size' into seen
2021-06-19  Junio C HamanoMerge branch 'hn/refs-errno-cleanup' into seen
2021-06-19  Junio C HamanoMerge branch 'jt/partial-clone-submodule-1' into seen
2021-06-19  Junio C HamanoMerge branch 'ar/submodule-add' into seen
2021-06-19  Junio C HamanoMerge branch 'fw/complete-cmd-idx-fix' into jch
2021-06-19  Junio C HamanoMerge branch 'jk/test-without-readlink-1' into jch
2021-06-17  Junio C HamanoMerge branch 'jx/sideband-cleanup' into jch
2021-06-17  Junio C HamanoMerge branch 'jk/test-avoid-globmatch-with-skip-pattern...
2021-06-17  Junio C HamanoMerge branch 'jv/userdiff-csharp-update' into jch
2021-06-17  Junio C HamanoMerge branch 'ab/pre-auto-gc-hook-test' into jch
2021-06-17  Junio C HamanoMerge branch 'ab/config-hooks-path-testfix' into jch
2021-06-17  Junio C HamanoMerge branch 'fc/pull-cleanups' into jch
2021-06-17  Junio C HamanoMerge branch 'jk/bitmap-tree-optim' into jch
2021-06-17  Junio C HamanoMerge branch 'ab/mktag-tests' into jch
2021-06-17  Junio C HamanoMerge branch 'ab/show-branch-tests' into jch
2021-06-17  Junio C HamanoMerge branch 'ah/graph-typofix' into jch
2021-06-17  Junio C HamanoMerge branch 'ds/gender-neutral-doc' into jch
2021-06-17  Junio C HamanoMerge branch 'jx/t6020-with-older-bash' into jch
2021-06-17  Junio C HamanoMerge branch 'ar/typofix' into jch
2021-06-17  Junio C HamanoMerge branch 'jk/union-merge-binary' into jch
2021-06-17  Junio C HamanoMerge branch 'zh/cat-file-batch-fix' into jch
2021-06-17  Junio C HamanoMerge branch 'js/trace2-discard-event-docfix' into jch
2021-06-14  Junio C HamanoMerge branch 'ab/trace2-squelch-gcc-warning'
2021-06-14  Junio C HamanoMerge branch 'en/ort-perf-batch-11'
2021-06-14  Junio C HamanoMerge branch 'jk/clone-clean-upon-transport-error'
2021-06-11  Jeff Kingll_union_merge(): rename path_unused parameter
2021-06-11  Jeff Kingll_union_merge(): pass name labels to ll_xdl_merge()
2021-06-11  Jeff Kingll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
2021-06-10  Junio C HamanoMerge branch 'ah/doc-describe'
2021-06-05  Jiang XinMerge branch 'fix_typo' of github.com:e-yes/git
2021-06-01  Junio C HamanoMerge branch 'ab/fsck-api-cleanup'
2021-05-30  Jiang XinMerge branch 'master' of github.com:Softcatala/git-po
2021-05-25  Junio C HamanoMerge branch 'mt/init-template-userpath-fix'
2021-05-22  Junio C HamanoMerge branch 'dl/stash-show-untracked-fixup'
2021-05-22  Junio C HamanoMerge branch 'jh/simple-ipc-sans-pthread'
2021-05-20  Junio C HamanoMerge branch 'ds/sparse-index-protections'
2021-05-19  Junio C HamanoMerge branch 'zh/ref-filter-push-remote-fix'
2021-05-16  Junio C HamanoMerge branch 'ls/typofix'
2021-05-16  Junio C HamanoMerge branch 'dl/stash-show-untracked-fixup'
2021-05-13  Junio C HamanoMerge branch 'mt/clean-clean'
2021-05-13  Junio C HamanoMerge branch 'pw/patience-diff-clean-up'
2021-05-11  Junio C HamanoMerge branch 'jk/doc-format-patch-skips-merges'
2021-05-07  Junio C HamanoMerge branch 'dl/complete-stash-updates'
2021-05-07  Junio C HamanoMerge branch 'dl/complete-stash'
2021-05-07  Junio C HamanoMerge branch 'ah/plugleaks'
2021-05-07  Junio C HamanoMerge branch 'mt/add-rm-in-sparse-checkout'
2021-05-07  Junio C HamanoMerge branch 'ps/config-env-option-with-separate-value'
2021-04-30  Junio C HamanoMerge branch 'ds/sparse-index-protections'
2021-04-28  Junio C HamanoMerge branch 'mt/add-rm-in-sparse-checkout' into ds...
2021-04-28  Junio C HamanoMerge branch 'ds/sparse-index-protections' into ds...
2021-04-21  Junio C HamanoMerge branch 'jt/fetch-pack-request-fix'
2021-04-21  Junio C HamanoMerge branch 'hn/reftable-tables-doc-update'
2021-04-16  Junio C HamanoMerge branch 'en/ort-readiness'
2021-04-16  Junio C HamanoMerge branch 'en/ort-perf-batch-10'
2021-04-13  Junio C HamanoMerge branch 'cc/test-helper-bloom-usage-fix'
2021-04-13  Junio C HamanoMerge branch 'tb/precompose-prefix-simplify'
2021-04-13  Junio C HamanoMerge branch 'jk/ref-filter-segfault-fix'
2021-04-09  Junio C HamanoMerge branch 'jt/fetch-pack-request-fix' into jt/push...
2021-04-08  Junio C HamanoMerge branch 'rs/daemon-sanitize-dir-sep'
2021-04-08  Junio C HamanoMerge branch 'en/ort-perf-batch-9'
2021-04-08  Junio C HamanoMerge branch 'tb/reverse-midx'
2021-04-07  Junio C HamanoMerge branch 'ab/fsck-api-cleanup'
2021-04-07  Junio C HamanoMerge branch 'ps/pack-bitmap-optim'
2021-04-07  Junio C HamanoMerge branch 'ds/clarify-hashwrite'
2021-04-07  Junio C HamanoMerge branch 'ah/plugleaks'
2021-04-02  Junio C HamanoMerge branch 'zh/format-patch-fractional-reroll-count'
2021-04-02  Junio C HamanoMerge branch 'jh/simple-ipc'
2021-04-02  Junio C HamanoMerge branch 'mt/parallel-checkout-part-1'
2021-03-30  Junio C HamanoMerge branch 'jc/doc-format-patch-clarify'
2021-03-30  Junio C HamanoMerge branch 'ab/detox-gettext-tests'
2021-03-30  Junio C HamanoMerge branch 'ab/diff-no-index-tests'
2021-03-30  Junio C HamanoMerge branch 'ab/read-tree'
next