Andrew's git - gitweb.git/history - Documentation/merge-options.txt

[gitweb.git] / Documentation / merge-options.txt

2019-04-09	Merge branch 'dl/reset-doc-no-wrt-abbrev'	blob \| diff \| raw
2019-04-01	Merge branch 'jt/test-protocol-version' into jt/fetch...	blob \| diff \| raw
2019-03-20	Merge branch 'br/commit-tree-parseopt'	blob \| diff \| raw
2019-03-20	Merge branch 'jk/config-type-color-ends-with-lf'	blob \| diff \| raw
2019-03-20	Merge branch 'ma/clear-repository-format'	blob \| diff \| raw
2019-03-20	Merge branch 'jk/virtual-objects-do-exist'	blob \| diff \| raw
2019-03-20	Merge branch 'jk/no-sigpipe-during-network-transport'	blob \| diff \| raw
2019-03-20	Merge branch 'jk/fsck-doc'	blob \| diff \| raw
2019-03-20	Merge branch 'js/stress-test-ui-tweak'	blob \| diff \| raw
2019-03-20	Merge branch 'js/rebase-orig-head-fix'	blob \| diff \| raw
2019-03-20	Merge branch 'jk/bisect-final-output'	blob \| diff \| raw
2019-03-20	Merge branch 'ab/makefile-help-devs-more'	blob \| diff \| raw
2019-03-18	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw
2019-03-11	Sync with maint	blob \| diff \| raw
2019-03-11	Merge branch 'js/rebase-recreate-merge'	blob \| diff \| raw
2019-03-11	Merge branch 'js/untravis-windows'	blob \| diff \| raw
2019-03-11	Merge branch 'rd/gc-prune-doc-fix'	blob \| diff \| raw
2019-03-11	Merge branch 'js/find-lib-h-with-ls-files-when-possible'	blob \| diff \| raw
2019-03-11	Merge branch 'rj/hdr-check-gcrypt-fix'	blob \| diff \| raw
2019-03-11	Merge branch 'jk/guard-bswap-header'	blob \| diff \| raw
2019-03-11	Merge branch 'rd/attr.c-comment-typofix'	blob \| diff \| raw
2019-03-11	Merge branch 'yb/utf-16le-bom-spellfix'	blob \| diff \| raw
2019-03-07	Merge branch 'jt/http-auth-proto-v2-fix'	blob \| diff \| raw
2019-03-07	Merge branch 'jk/diff-no-index-initialize'	blob \| diff \| raw
2019-03-07	Merge branch 'nd/no-more-check-racy'	blob \| diff \| raw
2019-03-07	Merge branch 'rd/doc-hook-used-in-sample'	blob \| diff \| raw
2019-03-07	Merge branch 'nd/diff-parseopt-2'	blob \| diff \| raw
2019-03-07	Merge branch 'en/merge-options-doc'	blob \| diff \| raw
2019-02-21	merge-options.txt: correct wording of --no-commit option	blob \| diff \| raw
2019-02-14	Merge branch 'jc/no-grepping-for-strerror-in-tests'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'cc/test-ref-store-typofix'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'cc/partial-clone-doc-typofix'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'hb/t0061-dot-in-path-fix'	blob \| diff \| raw \| diff to current
2018-11-21	Merge branch 'nd/packobjectshook-doc-fix' into maint	blob \| diff \| raw \| diff to current
2018-11-21	Merge branch 'jk/check-everything-connected-is-long...	blob \| diff \| raw \| diff to current
2018-11-21	Merge branch 'bw/protocol-v2' into maint	blob \| diff \| raw \| diff to current
2018-11-21	Merge branch 'ts/doc-build-manpage-xsl-quietly' into...	blob \| diff \| raw \| diff to current
2018-11-21	Merge branch 'js/diff-notice-has-drive-prefix' into...	blob \| diff \| raw \| diff to current
2018-11-21	Merge branch 'np/log-graph-octopus-fix' into maint	blob \| diff \| raw \| diff to current
2018-11-21	Merge branch 'nd/attr-pathspec-fix' into maint	blob \| diff \| raw \| diff to current
2018-10-31	Adjust for 2.19.x series	blob \| diff \| raw \| diff to current
2018-10-30	Merge branch 'js/diff-notice-has-drive-prefix'	blob \| diff \| raw \| diff to current
2018-10-26	Merge branch 'np/log-graph-octopus-fix'	blob \| diff \| raw \| diff to current
2018-10-25	t0061: adjust to test-tool transition	blob \| diff \| raw \| diff to current
2018-10-16	Merge branch 'nd/packobjectshook-doc-fix'	blob \| diff \| raw \| diff to current
2018-10-16	Merge branch 'jk/check-everything-connected-is-long...	blob \| diff \| raw \| diff to current
2018-09-27	Sync with 2.16.5	blob \| diff \| raw \| diff to current
2018-09-27	Sync with 2.15.3	blob \| diff \| raw \| diff to current
2018-09-27	Sync with Git 2.14.4	blob \| diff \| raw \| diff to current
2018-09-24	Merge branch 'nd/attr-pathspec-fix'	blob \| diff \| raw \| diff to current
2018-09-24	Merge branch 'bw/protocol-v2'	blob \| diff \| raw \| diff to current
2018-09-17	Merge branch 'ts/doc-build-manpage-xsl-quietly'	blob \| diff \| raw \| diff to current
2018-09-04	Merge branch 'ds/commit-graph-lockfile-fix'	blob \| diff \| raw \| diff to current
2018-08-27	Merge branch 'sg/t7501-thinkofix'	blob \| diff \| raw \| diff to current
2018-08-27	Merge branch 'sg/t0020-conversion-fix'	blob \| diff \| raw \| diff to current
2018-08-27	Merge branch 'sg/t4051-fix'	blob \| diff \| raw \| diff to current
2018-08-27	Merge branch 'js/larger-timestamps'	blob \| diff \| raw \| diff to current
2018-08-20	Merge branch 'nd/cherry-pick-quit-fix'	blob \| diff \| raw \| diff to current
2018-08-20	Merge branch 'sb/config-write-fix'	blob \| diff \| raw \| diff to current
2018-08-20	Merge branch 'jh/partial-clone-doc'	blob \| diff \| raw \| diff to current
2018-08-20	Merge branch 'sb/pull-rebase-submodule'	blob \| diff \| raw \| diff to current
2018-08-20	Merge branch 'js/typofixes'	blob \| diff \| raw \| diff to current
2018-08-17	Merge branch 'ar/t4150-am-scissors-test-fix'	blob \| diff \| raw \| diff to current
2018-08-17	Merge branch 'en/t3031-title-fix'	blob \| diff \| raw \| diff to current
2018-08-17	Merge branch 'rs/parse-opt-lithelp'	blob \| diff \| raw \| diff to current
2018-08-17	Merge branch 'jk/merge-subtree-heuristics'	blob \| diff \| raw \| diff to current
2018-08-15	Merge branch 'sb/histogram-less-memory'	blob \| diff \| raw \| diff to current
2018-08-15	Merge branch 'es/diff-color-moved-fix'	blob \| diff \| raw \| diff to current
2018-08-15	Merge branch 'bw/protocol-v2'	blob \| diff \| raw \| diff to current
2018-08-15	Merge branch 'sg/fast-import-dump-refs-on-checkpoint...	blob \| diff \| raw \| diff to current
2018-08-15	Merge branch 'jk/ui-color-always-to-auto'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'bc/sequencer-export-work-tree-as-well'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'sg/httpd-test-unflake'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'jk/has-uncommitted-changes-fix'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'sb/blame-color'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'wc/find-commit-with-pattern-on-detached...	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'jc/t3404-one-shot-export-fix'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'jk/empty-pick-fix'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'jk/fetch-all-peeled-fix'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'sb/submodule-move-head-error-msg'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'sb/blame-color' into jk/banned-function	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'js/enhanced-version-info'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'ms/core-icase-doc'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'ds/commit-graph'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'tz/exclude-doc-smallfixes'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'bw/protocol-v2'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'bw/config-refer-to-gitsubmodules-doc'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'xy/format-patch-prereq-patch-id-fix'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'ds/ewah-cleanup'	blob \| diff \| raw \| diff to current
2018-07-16	Merge branch 'jc/t3404-one-shot-export-fix' into es...	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'pw/add-p-recount'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'jk/fetch-all-peeled-fix'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'ms/send-pack-honor-config'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'jh/partial-clone'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'as/safecrlf-quiet-fix'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'sg/update-ref-stdin-cleanup'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'nd/reject-empty-shallow-request'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'ds/commit-graph-lockfile-fix'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'es/make-no-iconv'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'sg/t7406-chain-fix'	blob \| diff \| raw \| diff to current
next