Merge branch 'en/rebase-no-keep-empty'
[git] / Documentation / git-merge.txt
2020-04-22  Junio C HamanoMerge branch 'jc/missing-ref-store-fix'
2020-04-22  Junio C HamanoMerge branch 'js/t0007-typofix'
2020-04-22  Junio C HamanoMerge branch 'dl/wrapper-fix-indentation'
2020-04-19  Jonathan NiederGit 2.24.3 v2.24.3
2020-04-19  Jonathan NiederGit 2.23.3 v2.23.3
2020-04-19  Jonathan NiederGit 2.22.4 v2.22.4
2020-04-19  Jonathan NiederGit 2.20.4 v2.20.4
2020-04-19  Jonathan NiederGit 2.19.5 v2.19.5
2020-04-19  Jonathan NiederGit 2.18.4 v2.18.4
2020-03-25  Junio C HamanoMerge branch 'en/oidset-uninclude-hashmap'
2020-03-25  Junio C HamanoMerge branch 'sg/commit-slab-clarify-peek'
2020-03-19  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-03-17  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help' into maint
2020-03-17  Junio C HamanoMerge branch 'hd/show-one-mergetag-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'hi/gpg-use-check-signature' into maint
2020-03-17  Junio C HamanoGit 2.24.2 v2.24.2
2020-03-17  Junio C HamanoGit 2.23.2 v2.23.2
2020-03-17  Junio C HamanoGit 2.22.3 v2.22.3
2020-03-17  Junio C HamanoGit 2.20.3 v2.20.3
2020-03-17  Junio C HamanoGit 2.19.4 v2.19.4
2020-03-17  Junio C HamanoGit 2.18.3 v2.18.3
2020-03-11  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help'
2020-03-09  Junio C HamanoMerge branch 'hd/show-one-mergetag-fix'
2020-03-05  Junio C HamanoMerge branch 'hi/gpg-use-check-signature'
2020-03-05  Junio C HamanoMerge branch 'rs/commit-graph-code-simplification'
2020-02-14  Junio C HamanoMerge branch 'pk/status-of-uncloned-submodule'
2020-02-14  Junio C HamanoMerge branch 'ag/rebase-avoid-unneeded-checkout'
2020-02-14  Junio C HamanoMerge branch 'jk/packfile-reuse-cleanup'
2020-02-14  Junio C HamanoMerge branch 'jb/multi-pack-index-docfix' into maint
2020-02-14  Junio C HamanoMerge branch 'ma/diff-doc-clarify-regexp-example' into...
2020-02-14  Junio C HamanoMerge branch 'bc/actualmente' into maint
2020-02-14  Junio C HamanoMerge branch 'nd/switch-and-restore' into maint
2020-02-14  Junio C HamanoMerge branch 'jk/no-flush-upon-disconnecting-slrpc...
2020-02-12  Junio C HamanoMerge branch 'jb/multi-pack-index-docfix'
2020-02-12  Junio C HamanoMerge branch 'ma/diff-doc-clarify-regexp-example'
2020-01-30  Junio C HamanoMerge branch 'lh/bool-to-type-bool'
2020-01-30  Junio C HamanoMerge branch 'bc/actualmente'
2020-01-22  Junio C HamanoMerge branch 'nd/switch-and-restore'
2020-01-22  Junio C HamanoMerge branch 'jk/no-flush-upon-disconnecting-slrpc...
2020-01-08  Junio C HamanoMerge branch 'tm/doc-submodule-absorb-fix'
2020-01-08  Junio C HamanoMerge branch 'jb/doc-multi-pack-idx-fix'
2020-01-08  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-01-06  Junio C HamanoMerge branch 'pb/clarify-line-log-doc'
2020-01-06  Junio C HamanoMerge branch 'ew/packfile-syscall-optim'
2020-01-02  Junio C HamanoMerge branch 'js/use-test-tool-on-path'
2019-12-25  Junio C HamanoMerge branch 'rs/xdiff-ignore-ws-w-func-context'
2019-12-25  Junio C HamanoMerge branch 'mr/bisect-use-after-free'
2019-12-25  Junio C HamanoMerge branch 'dl/format-patch-notes-config-fixup'
2019-12-16  Junio C HamanoMerge branch 'rs/commit-export-env-simplify'
2019-12-16  Junio C HamanoMerge branch 'rs/archive-zip-code-cleanup'
2019-12-16  Junio C HamanoMerge branch 'rs/xdiff-ignore-ws-w-func-context'
2019-12-10  Junio C HamanoMerge branch 'ag/sequencer-continue-leakfix'
2019-12-10  Junio C HamanoMerge branch 'hi/gpg-use-check-signature'
2019-12-10  Junio C HamanoMerge branch 'bc/t9001-zsh-in-posix-emulation-mode'
2019-12-10  Junio C HamanoMerge branch 'sg/test-squelch-noise-in-commit-bulk'
2019-12-10  Junio C HamanoMerge branch 'jk/perf-wo-git-dot-pm'
2019-12-10  Junio C HamanoMerge branch 'as/t7812-missing-redirects-fix'
2019-12-10  Junio C HamanoMerge branch 'dl/pretty-reference'
2019-12-10  Junio C HamanoMerge branch 'po/bundle-doc-clonable'
2019-12-10  Junio C HamanoMerge branch 'ra/rebase-i-more-options'
2019-12-06  Junio C HamanoMerge branch 'dl/lore-is-the-archive'
2019-12-06  Junio C HamanoMerge branch 'jk/lore-is-the-archive'
2019-12-06  Junio C HamanoMerge branch 'tg/perf-remove-stale-result'
2019-12-06  Junio C HamanoMerge branch 'rs/simplify-prepare-cmd'
2019-12-06  Junio C HamanoMerge branch 'sg/assume-no-todo-update-in-cherry-pick'
2019-12-06  Junio C HamanoMerge branch 'sg/osx-force-gcc-9'
2019-12-06  Johannes SchindelinSync with 2.23.1
2019-12-06  Johannes SchindelinSync with 2.22.2
2019-12-06  Johannes SchindelinSync with 2.21.1
2019-12-06  Johannes SchindelinSync with 2.19.3
2019-12-06  Johannes SchindelinSync with 2.18.2
2019-12-06  Johannes SchindelinSync with 2.17.3
2019-12-06  Johannes SchindelinSync with 2.15.4
2019-12-06  Johannes SchindelinSync with 2.14.6
2019-12-05  Junio C HamanoMerge branch 'js/pkt-line-h-typofix'
2019-12-05  Junio C HamanoMerge branch 'us/unpack-trees-fsmonitor'
2019-12-05  Junio C HamanoMerge branch 'mh/clear-topo-walk-upon-reset'
2019-12-05  Junio C HamanoMerge branch 'mg/submodule-status-from-a-subdirectory'
2019-12-05  Junio C HamanoMerge branch 'mg/doc-submodule-status-cached'
2019-12-05  Junio C HamanoMerge branch 'hi/gpg-optional-pkfp-fix'
2019-12-05  Junio C HamanoMerge branch 'pw/sequencer-compare-with-right-parent...
2019-12-05  Junio C HamanoMerge branch 'sg/unpack-progress-throughput'
2019-12-05  Junio C HamanoMerge branch 'pb/submodule-update-fetches'
2019-12-05  Junio C HamanoMerge branch 'jh/userdiff-python-async'
2019-12-05  Junio C HamanoMerge branch 'ep/guard-kset-tar-headers'
2019-12-01  Junio C HamanoMerge branch 'jk/gitweb-anti-xss'
2019-12-01  Junio C HamanoMerge branch 'ar/install-doc-update-cmds-needing-the...
2019-12-01  Junio C HamanoMerge branch 'ma/t7004'
2019-12-01  Junio C HamanoMerge branch 'js/complete-svn-recursive'
2019-12-01  Junio C HamanoMerge branch 'jk/send-pack-remote-failure'
2019-12-01  Junio C HamanoMerge branch 'jc/fsmonitor-sanity-fix'
2019-12-01  Junio C HamanoMerge branch 'sg/skip-skipped-prereq'
2019-12-01  Junio C HamanoMerge branch 'rs/use-copy-array-in-mingw-shell-command...
2019-12-01  Junio C HamanoMerge branch 'rs/parse-options-dup-null-fix'
2019-12-01  Junio C HamanoMerge branch 'jk/optim-in-pack-idx-conversion'
2019-12-01  Junio C HamanoMerge branch 'dl/complete-rebase-onto'
2019-12-01  Junio C HamanoMerge branch 'tg/stash-refresh-index'
2019-12-01  Junio C HamanoMerge branch 'dj/typofix-merge-strat'
2019-12-01  Junio C HamanoMerge branch 'py/shortlog-list-options-for-log'
2019-12-01  Junio C HamanoMerge branch 'ns/test-desc-typofix'
next