Merge branch 'js/doc-patch-text'
[git] / Documentation / merge-options.txt
2019-10-07  Junio C HamanoMerge branch 'js/doc-patch-text'
2019-10-07  Junio C HamanoMerge branch 'tb/commit-graph-harden'
2019-10-07  Junio C HamanoMerge branch 'jt/cache-tree-avoid-lazy-fetch-during...
2019-10-07  Junio C HamanoMerge branch 'dl/cocci-everywhere'
2019-10-07  Junio C HamanoMerge branch 'gs/commit-graph-progress'
2019-10-07  Junio C HamanoMerge branch 'ms/fetch-follow-tag-optim'
2019-10-07  Junio C HamanoMerge branch 'rs/commit-graph-use-list-count'
2019-10-07  Junio C HamanoMerge branch 'rs/nth-parent-parse'
2019-10-07  Junio C HamanoMerge branch 'dl/submodule-set-branch'
2019-10-07  Junio C HamanoMerge branch 'cs/pretty-formats-doc-typofix'
2019-10-07  Junio C HamanoMerge branch 'jk/list-objects-optim-wo-trees'
2019-10-07  Junio C HamanoMerge branch 'jk/disable-commit-graph-during-upload...
2019-10-07  Junio C HamanoMerge branch 'mr/complete-more-for-log-etc'
2019-10-07  Junio C HamanoMerge branch 'dl/complete-rebase-and-archive'
2019-10-07  Junio C HamanoMerge branch 'jk/commit-graph-cleanup'
2019-10-07  Junio C HamanoMerge branch 'ss/get-time-cleanup'
2019-10-07  Junio C HamanoMerge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
2019-10-07  Junio C HamanoMerge branch 'jk/partial-clone-sparse-blob'
2019-10-07  Junio C HamanoMerge branch 'tg/stash-refresh-index'
2019-10-06  Junio C HamanoMerge branch 'cb/skip-utf8-check-with-pcre1'
2019-10-06  Junio C HamanoMerge branch 'ma/user-manual-markup-update'
2019-10-06  Junio C HamanoMerge branch 'bc/doc-use-docbook-5'
2019-10-06  Junio C HamanoMerge branch 'ma/asciidoctor-more-fixes'
2019-10-06  Junio C HamanoMerge branch 'ma/asciidoctor-refmiscinfo'
2019-10-06  Junio C HamanoMerge branch 'am/mailmap-andrey-mazo'
2019-10-06  Junio C HamanoMerge branch 'jc/git-gui-has-maintainer'
2019-09-30  Junio C HamanoMerge branch 'ds/commit-graph-on-fetch'
2019-09-30  Junio C HamanoMerge branch 'bw/rebase-autostash-keep-current-branch'
2019-09-30  Junio C HamanoMerge branch 'ds/include-exclude'
2019-09-30  Junio C HamanoMerge branch 'jh/trace2-pretty-output'
2019-09-30  Junio C HamanoMerge branch 'dl/rebase-i-keep-base'
2019-09-30  Junio C HamanoMerge branch 'sg/clean-nested-repo-with-ignored'
2019-09-30  Junio C HamanoMerge branch 'dl/complete-cherry-pick-revert-skip'
2019-09-30  Junio C HamanoMerge branch 'dl/use-sq-from-test-lib'
2019-09-30  Junio C HamanoMerge branch 'jk/misc-uninitialized-fixes'
2019-09-30  Junio C HamanoMerge branch 'sg/git-test-boolean'
2019-09-30  Junio C HamanoMerge branch 'rs/get-tagged-oid'
2019-09-30  Junio C HamanoMerge branch 'en/filter-branch-deprecation'
2019-09-30  Junio C HamanoMerge branch 'en/merge-options-ff-and-friends'
2019-09-30  Junio C HamanoMerge branch 'tg/push-all-in-mirror-forbidden'
2019-09-30  Junio C HamanoMerge branch 'dt/remote-helper-doc-re-lock-option'
2019-09-30  Junio C HamanoMerge branch 'rs/help-unknown-ref-does-not-return'
2019-09-30  Junio C HamanoMerge branch 'nd/switch-and-restore'
2019-09-30  Junio C HamanoMerge branch 'tb/file-url-to-unc-path'
2019-09-30  Junio C HamanoMerge branch 'js/gitdir-at-unc-root'
2019-09-30  Junio C HamanoMerge branch 'ar/mingw-run-external-with-non-ascii...
2019-09-30  Junio C HamanoMerge branch 'rs/parse-tree-indirect'
2019-09-30  Junio C HamanoMerge branch 'jk/fast-import-history-bugfix'
2019-09-30  Junio C HamanoMerge branch 'mh/notes-duplicate-entries'
2019-09-30  Junio C HamanoMerge branch 'tb/banned-vsprintf-namefix'
2019-09-30  Junio C HamanoMerge branch 'mh/release-commit-memory-fix'
2019-09-30  Junio C HamanoMerge branch 'mh/http-urlmatch-cleanup'
2019-09-30  Junio C HamanoMerge branch 'rs/strbuf-detach'
2019-09-30  Junio C HamanoMerge branch 'rs/trace2-dst-warning'
2019-09-30  Junio C HamanoMerge branch 'dl/format-patch-doc-test-cleanup'
2019-09-30  Junio C HamanoMerge branch 'bc/hash-independent-tests-part-5'
2019-09-30  Junio C HamanoMerge branch 'jc/test-cleanup'
2019-09-30  Junio C HamanoMerge branch 'dl/compat-cleanup'
2019-09-30  Junio C HamanoMerge branch 'js/visual-studio'
2019-09-18  Junio C HamanoMerge branch 'jt/avoid-ls-refs-with-http'
2019-09-18  Junio C HamanoMerge branch 'md/list-objects-filter-combo'
2019-09-18  Junio C HamanoMerge branch 'cc/multi-promisor'
2019-09-18  Junio C HamanoMerge branch 'sg/line-log-tree-diff-optim'
2019-09-18  Junio C HamanoMerge branch 'sg/complete-configuration-variables'
2019-09-18  Junio C HamanoMerge branch 'js/pre-merge-commit-hook'
2019-09-18  Junio C HamanoMerge branch 'js/rebase-r-strategy'
2019-09-18  Junio C HamanoMerge branch 'master' of https://github.com/prati0100...
2019-09-17  Junio C HamanoMerge gitk to pick up emergency build fix
2019-09-16  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2019-09-09  Junio C HamanoMerge branch 'mp/for-each-ref-missing-name-or-email'
2019-09-09  Junio C HamanoMerge branch 'nd/diff-parseopt'
2019-09-09  Junio C HamanoMerge branch 'ds/midx-expire-repack'
2019-09-09  Junio C HamanoMerge branch 'rs/pax-extended-header-length-fix'
2019-09-09  Junio C HamanoMerge branch 'en/checkout-mismerge-fix'
2019-09-01  Elijah Newrenmerge-options.txt: clarify meaning of various ff-relate...
2019-08-22  Junio C HamanoMerge branch 'rs/nedalloc-fixlets'
2019-08-09  Junio C HamanoMerge branch 'cb/xdiff-no-system-includes-in-dot-c...
2019-08-09  Junio C HamanoMerge branch 'jk/no-system-includes-in-dot-c' into...
2019-08-09  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index...
2019-08-09  Junio C HamanoMerge branch 'mt/dir-iterator-updates'
2019-08-09  Junio C HamanoMerge branch 'ds/commit-graph-incremental'
2019-08-08  Junio C HamanoMerge branch 'nd/switch-and-restore'
2019-08-07  Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github...
2019-08-07  Michael J Grubermerge: do no-verify like commit
2019-08-01  Junio C HamanoMerge branch 'jc/dir-iterator-test-fix'
2019-07-31  Junio C HamanoMerge branch 'cb/xdiff-no-system-includes-in-dot-c'
2019-07-31  Junio C HamanoMerge branch 'jk/no-system-includes-in-dot-c'
2019-07-30  Jiang XinMerge tag 'v2.23.0-rc0' of git://git./git/git
2019-07-29  Junio C HamanoMerge branch 'js/rebase-cleanup'
2019-07-29  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index'
2019-07-29  Junio C HamanoMerge branch 'sg/travis-gcc-4.8'
2019-07-29  Junio C HamanoMerge branch 'bb/grep-pcre2-bug-message-fix'
2019-07-29  Junio C HamanoMerge branch 'jc/post-c89-rules-doc' into maint
2019-07-29  Junio C HamanoMerge branch 'fc/fetch-with-import-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'ds/close-object-store' into maint
2019-07-29  Junio C HamanoMerge branch 'pw/add-p-recount' into maint
2019-07-29  Junio C HamanoMerge branch 'rs/avoid-overflow-in-midpoint-computation...
2019-07-29  Junio C HamanoMerge branch 'jk/trailers-use-config' into maint
2019-07-29  Junio C HamanoMerge branch 'tg/stash-ref-by-index-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'pw/rebase-abort-clean-rewritten' into...
next