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

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

2019-05-13	Merge branch 'jh/trace2'	blob \| diff \| raw
2019-05-13	Merge branch 'cc/access-on-aix-workaround'	blob \| diff \| raw
2019-05-13	Merge branch 'pw/clean-sequencer-state-upon-final-commit'	blob \| diff \| raw
2019-05-13	Merge branch 'pw/rebase-i-internal'	blob \| diff \| raw
2019-05-13	Merge branch 'jk/perf-aggregate-wo-libjson'	blob \| diff \| raw
2019-05-13	Merge branch 'dl/rev-tilde-doc-clarify'	blob \| diff \| raw
2019-05-13	Merge branch 'jc/make-dedup-ls-files-output'	blob \| diff \| raw
2019-05-13	Merge branch 'jk/ls-files-doc-markup-fix'	blob \| diff \| raw
2019-05-13	Merge branch 'jk/p5302-avoid-collision-check-cost'	blob \| diff \| raw
2019-05-13	Merge branch 'dl/no-extern-in-func-decl'	blob \| diff \| raw
2019-05-13	Merge branch 'ew/repack-with-bitmaps-by-default'	blob \| diff \| raw
2019-05-13	Merge branch 'js/partial-clone-connectivity-check'	blob \| diff \| raw
2019-05-13	Merge branch 'jh/trace2-sid-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'vk/autoconf-gettext'	blob \| diff \| raw
2019-05-08	Merge branch 'cc/aix-has-fileno-as-a-macro'	blob \| diff \| raw
2019-05-08	Merge branch 'jt/submodule-repo-is-with-worktree'	blob \| diff \| raw
2019-05-08	Merge branch 'jk/untracked-cache-more-fixes'	blob \| diff \| raw
2019-05-08	Merge branch 'jk/prune-optim'	blob \| diff \| raw
2019-05-08	Merge branch 'js/misc-doc-fixes'	blob \| diff \| raw
2019-05-08	Merge branch 'dr/ref-filter-push-track-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'ss/msvc-path-utils-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'jt/clone-server-option'	blob \| diff \| raw
2019-05-08	Merge branch 'tb/unexpected'	blob \| diff \| raw
2019-05-08	Merge branch 'nd/sha1-name-c-wo-the-repository'	blob \| diff \| raw
2019-05-08	Merge branch 'cc/replace-graft-peel-tags'	blob \| diff \| raw
2019-05-08	Merge branch 'js/trace2-to-directory'	blob \| diff \| raw
2019-05-08	Merge branch 'dl/merge-cleanup-scissors-fix'	blob \| diff \| raw
2019-05-08	Merge branch 'tz/git-svn-doc-markup-fix'	blob \| diff \| raw \| diff to current
2019-05-08	Merge branch 'km/empty-repo-is-still-a-repo'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'js/macos-gettext-build'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'bc/send-email-qp-cr'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'nd/submodule-foreach-quiet'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'js/iso8895-test-on-apfs'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'jc/gettext-test-fix'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'jk/xmalloc'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'km/t3000-retitle'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'js/untracked-cache-allocfix'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'js/t3301-unbreak-notes-test'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'tz/doc-apostrophe-no-longer-needed'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'sg/blame-in-bare-start-at-head'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'tg/ls-files-debug-format-fix'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'po/describe-not-necessarily-7'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'po/rerere-doc-fmt'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'sg/overlong-progress-fix'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'dl/submodule-set-branch'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'jk/revision-rewritten-parents-in-prio...	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'dk/blame-keep-origin-blob'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'en/fast-import-parsing-fix'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'jt/fetch-pack-wanted-refs-optim'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'ab/commit-graph-fixes'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'nd/commit-a-with-paths-msg-update'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'jk/server-info-rabbit-hole'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'nd/diff-parseopt-4'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'ag/sequencer-reduce-rewriting-todo'	blob \| diff \| raw \| diff to current
2019-04-25	Merge branch 'bp/post-index-change-hook'	blob \| diff \| raw \| diff to current
2019-04-22	Merge branch 'nd/read-tree-reset-doc'	blob \| diff \| raw \| diff to current
2019-04-22	Merge branch 'nd/interpret-trailers-docfix'	blob \| diff \| raw \| diff to current
2019-04-22	Merge branch 'js/check-docs-exe'	blob \| diff \| raw \| diff to current
2019-04-22	Merge branch 'nd/include-if-wildmatch'	blob \| diff \| raw \| diff to current
2019-04-22	Merge branch 'cb/doco-mono'	blob \| diff \| raw \| diff to current
2019-04-22	Merge branch 'tg/stash-in-c-show-default-to-p-fix'	blob \| diff \| raw \| diff to current
2019-04-22	Merge branch 'js/stash-in-c-pathspec-fix'	blob \| diff \| raw \| diff to current
2019-04-22	Merge branch 'tb/stash-in-c-unused-param-fix'	blob \| diff \| raw \| diff to current
2019-04-22	Merge branch 'ps/stash-in-c'	blob \| diff \| raw \| diff to current
2019-04-19	Merge branch 'ag/sequencer-reduce-rewriting-todo' into...	blob \| diff \| raw \| diff to current
2019-04-18	merge: add scissors line on merge conflict	blob \| diff \| raw
2019-04-18	merge: cleanup messages like commit	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'sg/t5318-cleanup'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'jt/t5551-protocol-v2-does-not-have-half...	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'bb/unicode-12'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'jk/refs-double-abort'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'nd/checkout-m-doc-update'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'tb/trace2-va-list-fix'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'ab/doc-misc-typofixes'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'mh/pack-protocol-doc-fix'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'tg/glossary-overlay'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'jc/format-patch-error-check'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'js/remote-curl-i18n'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'js/anonymize-remote-curl-diag'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'ma/asciidoctor-fixes-more'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'ma/asciidoctor-fixes'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'jt/test-protocol-version'	blob \| diff \| raw \| diff to current
2019-04-16	Merge branch 'nd/diff-parseopt-3'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'jt/submodule-fetch-errmsg'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'jk/sha1dc'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'jk/promote-ggg'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'ar/t4150-remove-cruft'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'ms/worktree-add-atomic-mkdir'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'jk/line-log-with-patch'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'ra/t3600-test-path-funcs'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'nd/rewritten-ref-is-per-worktree'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'jh/resize-convert-scratch-buffer'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'dl/ignore-docs'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'ja/dir-rename-doc-markup-fix'	blob \| diff \| raw \| diff to current
2019-04-09	Merge branch 'dl/reset-doc-no-wrt-abbrev'	blob \| diff \| raw \| diff to current
2019-04-01	Merge branch 'jt/test-protocol-version' into jt/fetch...	blob \| diff \| raw \| diff to current
2019-03-20	Merge branch 'br/commit-tree-parseopt'	blob \| diff \| raw \| diff to current
2019-03-20	Merge branch 'jk/config-type-color-ends-with-lf'	blob \| diff \| raw \| diff to current
2019-03-20	Merge branch 'ma/clear-repository-format'	blob \| diff \| raw \| diff to current
2019-03-20	Merge branch 'jk/virtual-objects-do-exist'	blob \| diff \| raw \| diff to current
next