git.oblomov.eu Git - git/history - Documentation/merge-options.txt

[git] / Documentation / merge-options.txt

2020-04-22	Junio C Hamano	Merge branch 'js/mingw-fixes'	blob \| commitdiff \| raw
2020-04-22	Junio C Hamano	Merge branch 'jc/missing-ref-store-fix'	blob \| commitdiff \| raw
2020-04-22	Junio C Hamano	Merge branch 'ma/config-doc-fix'	blob \| commitdiff \| raw
2020-04-22	Junio C Hamano	Merge branch 'eb/format-patch-no-encode-headers'	blob \| commitdiff \| raw
2020-04-22	Junio C Hamano	Merge branch 'pb/pull-fetch-doc'	blob \| commitdiff \| raw
2020-04-22	Junio C Hamano	Merge branch 'dd/no-gpg-sign'	blob \| commitdiff \| raw
2020-04-22	Junio C Hamano	Merge branch 'js/t0007-typofix'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'jc/allow-strlen-substitution-in-shell...	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'dl/wrapper-fix-indentation'	blob \| commitdiff \| raw \| diff to current
2020-04-19	Jonathan Nieder	Git 2.25.4 v2.25.4	blob \| commitdiff \| raw \| diff to current
2020-04-19	Jonathan Nieder	Git 2.24.3 v2.24.3	blob \| commitdiff \| raw \| diff to current
2020-04-19	Jonathan Nieder	Git 2.22.4 v2.22.4	blob \| commitdiff \| raw \| diff to current
2020-04-03	Đoàn Trần Công Danh	Documentation: document merge option --no-gpg-sign	blob \| commitdiff \| raw
2020-03-27	Junio C Hamano	Merge branch 'jc/describe-misnamed-annotated-tag'	blob \| commitdiff \| raw \| diff to current
2020-03-27	Junio C Hamano	Merge branch 'at/rebase-fork-point-regression-fix'	blob \| commitdiff \| raw \| diff to current
2020-03-25	Junio C Hamano	Merge branch 'en/oidset-uninclude-hashmap'	blob \| commitdiff \| raw \| diff to current
2020-03-25	Junio C Hamano	Merge branch 'sg/commit-slab-clarify-peek'	blob \| commitdiff \| raw \| diff to current
2020-03-19	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-03-18	Junio C Hamano	Git 2.25.3 v2.25.3	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'jk/run-command-formatfix' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'js/mingw-open-in-gdb' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'js/test-unc-fetch' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'js/test-write-junit-xml-fix' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'en/simplify-check-updates-in-unpack-trees...	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'jc/doc-single-h-is-for-help' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'hd/show-one-mergetag-fix' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'am/mingw-poll-fix' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'hi/gpg-use-check-signature' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'en/check-ignore' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'jk/push-option-doc-markup-fix' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'jk/doc-diff-parallel' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'jh/notes-fanout-fix' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'jk/index-pack-dupfix' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'js/builtin-add-i-cmds' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Git 2.24.2 v2.24.2	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Git 2.22.3 v2.22.3	blob \| commitdiff \| raw \| diff to current
2020-03-11	Junio C Hamano	Merge branch 'ds/sparse-add'	blob \| commitdiff \| raw \| diff to current
2020-03-11	Junio C Hamano	Merge branch 'jc/doc-single-h-is-for-help'	blob \| commitdiff \| raw \| diff to current
2020-03-09	Junio C Hamano	Merge branch 'hd/show-one-mergetag-fix'	blob \| commitdiff \| raw \| diff to current
2020-03-09	Junio C Hamano	Merge branch 'am/mingw-poll-fix'	blob \| commitdiff \| raw \| diff to current
2020-03-05	Junio C Hamano	Merge branch 'hi/gpg-use-check-signature'	blob \| commitdiff \| raw \| diff to current
2020-03-05	Junio C Hamano	Merge branch 'rs/commit-graph-code-simplification'	blob \| commitdiff \| raw \| diff to current
2020-03-05	Junio C Hamano	Merge branch 'ds/sparse-add'	blob \| commitdiff \| raw \| diff to current
2020-03-02	Junio C Hamano	Merge branch 'rs/blame-typefix-for-fingerprint'	blob \| commitdiff \| raw \| diff to current
2020-03-02	Junio C Hamano	Merge branch 'es/worktree-cleanup'	blob \| commitdiff \| raw \| diff to current
2020-03-02	Junio C Hamano	Merge branch 'jk/run-command-formatfix'	blob \| commitdiff \| raw \| diff to current
2020-03-02	Junio C Hamano	Merge branch 'en/check-ignore'	blob \| commitdiff \| raw \| diff to current
2020-03-02	Junio C Hamano	Merge branch 'jk/push-option-doc-markup-fix'	blob \| commitdiff \| raw \| diff to current
2020-03-02	Junio C Hamano	Merge branch 'jk/doc-diff-parallel'	blob \| commitdiff \| raw \| diff to current
2020-02-17	Junio C Hamano	Merge branch 'js/mingw-open-in-gdb'	blob \| commitdiff \| raw \| diff to current
2020-02-17	Junio C Hamano	Merge branch 'js/test-unc-fetch'	blob \| commitdiff \| raw \| diff to current
2020-02-17	Junio C Hamano	Merge branch 'js/test-avoid-pipe'	blob \| commitdiff \| raw \| diff to current
2020-02-17	Junio C Hamano	Merge branch 'js/test-write-junit-xml-fix'	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'jk/index-pack-dupfix'	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'jh/notes-fanout-fix'	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'pk/status-of-uncloned-submodule'	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'ds/sparse-checkout-harden'	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'dl/test-must-fail-fixes-2'	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'ag/rebase-avoid-unneeded-checkout'	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'jk/packfile-reuse-cleanup'	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'js/convert-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'jb/multi-pack-index-docfix' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'ma/diff-doc-clarify-regexp-example' into...	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'ms/doc-bundle-format' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'es/submodule-fetch-message-fix' into...	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'km/submodule-doc-use-sm-path' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'ds/refmap-doc' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'bc/actualmente' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'jk/test-fixes' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'jk/asan-build-fix' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'ds/sparse-cone' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'nd/switch-and-restore' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'jk/no-flush-upon-disconnecting-slrpc...	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'hw/tutorial-favor-switch-over-checkout...	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'es/unpack-trees-oob-fix' into maint	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'bc/run-command-nullness-after-free-fix...	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'en/string-list-can-be-custom-sorted'...	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'jt/sha1-file-remove-oi-skip-cached' into...	blob \| commitdiff \| raw \| diff to current
2020-02-14	Junio C Hamano	Merge branch 'hw/commit-advise-while-rejecting' into...	blob \| commitdiff \| raw \| diff to current
2020-02-12	Junio C Hamano	Merge branch 'js/convert-typofix'	blob \| commitdiff \| raw \| diff to current
2020-02-12	Junio C Hamano	Merge branch 'jb/multi-pack-index-docfix'	blob \| commitdiff \| raw \| diff to current
2020-02-12	Junio C Hamano	Merge branch 'ma/diff-doc-clarify-regexp-example'	blob \| commitdiff \| raw \| diff to current
2020-02-12	Junio C Hamano	Merge branch 'ms/doc-bundle-format'	blob \| commitdiff \| raw \| diff to current
2020-02-12	Junio C Hamano	Merge branch 'es/submodule-fetch-message-fix'	blob \| commitdiff \| raw \| diff to current
2020-02-12	Junio C Hamano	Merge branch 'km/submodule-doc-use-sm-path'	blob \| commitdiff \| raw \| diff to current
2020-02-12	Junio C Hamano	Merge branch 'jk/escaped-wildcard-dwim'	blob \| commitdiff \| raw \| diff to current
2020-02-12	Junio C Hamano	Merge branch 'jn/pretend-object-doc'	blob \| commitdiff \| raw \| diff to current
2020-02-05	Junio C Hamano	Merge branch 'am/checkout-file-and-ref-ref-ambiguity'	blob \| commitdiff \| raw \| diff to current
2020-02-05	Junio C Hamano	Merge branch 'js/add-p-leftover-bits'	blob \| commitdiff \| raw \| diff to current
2020-02-05	Junio C Hamano	Merge branch 'js/patch-mode-in-others-in-c'	blob \| commitdiff \| raw \| diff to current
2020-02-05	Junio C Hamano	Merge branch 'dl/test-must-fail-fixes'	blob \| commitdiff \| raw \| diff to current
2020-01-30	Junio C Hamano	Merge branch 'lh/bool-to-type-bool'	blob \| commitdiff \| raw \| diff to current
2020-01-30	Junio C Hamano	Merge branch 'ds/refmap-doc'	blob \| commitdiff \| raw \| diff to current
2020-01-30	Junio C Hamano	Merge branch 'bc/actualmente'	blob \| commitdiff \| raw \| diff to current
2020-01-30	Junio C Hamano	Merge branch 'js/builtin-add-i-cmds'	blob \| commitdiff \| raw \| diff to current
2020-01-30	Junio C Hamano	Merge branch 'jk/test-fixes'	blob \| commitdiff \| raw \| diff to current
2020-01-30	Junio C Hamano	Merge branch 'jk/asan-build-fix'	blob \| commitdiff \| raw \| diff to current
2020-01-30	Junio C Hamano	Merge branch 'ds/sparse-cone'	blob \| commitdiff \| raw \| diff to current
2020-01-30	Junio C Hamano	Merge branch 'hi/indent-text-with-tabs-in-editorconfig'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom