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

[git] / Documentation / merge-options.txt

2020-05-01	Junio C Hamano	Merge branch 'ds/build-homebrew-gettext-fix'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'dd/sparse-fixes'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'mt/doc-worktree-ref'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'eb/gitweb-more-trailers'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'ds/multi-pack-index'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'ds/blame-on-bloom'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'gs/commit-graph-path-filter'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'tb/commit-graph-fd-exhaustion-fix'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'tb/commit-graph-split-strategy'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'tb/reset-shallow'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'dd/mailinfo-with-nul'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'dl/test-must-fail-fixes-4'	blob \| commitdiff \| raw
2020-05-01	Junio C Hamano	Merge branch 'jk/build-with-right-curl'	blob \| commitdiff \| raw
2020-04-29	Junio C Hamano	Merge branch 'ps/transactional-update-ref-stdin'	blob \| commitdiff \| raw
2020-04-29	Junio C Hamano	Merge branch 'en/fill-directory-exponential'	blob \| commitdiff \| raw
2020-04-29	Junio C Hamano	Merge branch 'en/sparse-checkout'	blob \| commitdiff \| raw
2020-04-29	Junio C Hamano	Merge branch 'dd/ci-swap-azure-pipelines-with-github...	blob \| commitdiff \| raw
2020-04-29	Junio C Hamano	Merge branch 'dd/ci-musl-libc'	blob \| commitdiff \| raw
2020-04-29	Junio C Hamano	Merge branch 'dl/merge-autostash-rebase-quit-fix'	blob \| commitdiff \| raw
2020-04-29	Junio C Hamano	Merge branch 'dl/merge-autostash'	blob \| commitdiff \| raw
2020-04-28	Junio C Hamano	Merge branch 'jn/demote-proto2-from-default'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'jc/gnu-hurd-lets-fread-read-dirs'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'ms/doc-revision-illustration-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'tm/zsh-complete-switch-restore'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'mt/grep-cquote-path'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'ds/log-exclude-decoration-config'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'vd/range-diff-with-custom-pretty-format...	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'tb/diff-tree-with-notes'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'eb/mboxrd-doc'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'js/stash-p-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'dl/libify-a-few'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'jx/atomic-push'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'jt/avoid-prefetch-when-able-in-diff'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'js/subtree-doc-update-to-asciidoctor-2'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'ds/t5319-touch-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'ds/commit-graph-expiry-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'dr/doc-recurse-submodules'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'jc/log-no-mailmap'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'ma/doc-discard-docbook-xsl-1.73'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'lx/submodule-clear-variables'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'jk/fast-import-use-hashmap'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'jk/config-use-size-t'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'bc/constant-memequal'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'lr/freshen-file-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'en/rebase-doc-hooks-called-by-accident'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'jc/doc-test-leaving-early'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'dd/test-with-busybox'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'jk/credential-parsing-end-of-host-in...	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'jt/rebase-allow-duplicate'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'en/rebase-no-keep-empty'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'js/mingw-is-hidden-test-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'js/mingw-isilon-nfs'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'js/flush-prompt-before-interative-input'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'ds/revision-show-pulls'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'ma/simplify-merge-config-parsing'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'js/mingw-fixes'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'jc/missing-ref-store-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'ma/config-doc-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'eb/format-patch-no-encode-headers'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'pb/pull-fetch-doc'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'dd/no-gpg-sign'	blob \| commitdiff \| raw \| diff to current
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-10	Denton Liu	pull: pass --autostash to merge	blob \| commitdiff \| raw \| diff to current
2020-04-10	Denton Liu	merge: teach --autostash option	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 \| diff to current
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
next

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

RSS Atom