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

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

2019-04-25	Merge branch 'js/difftool-no-index'	blob \| diff \| raw
2019-04-25	Merge branch 'pw/cherry-pick-continue'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/commit-a-with-paths-msg-update'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/server-info-rabbit-hole'	blob \| diff \| raw
2019-04-25	Merge branch 'nd/diff-parseopt-4'	blob \| diff \| raw
2019-04-25	Merge branch 'jk/unused-params-even-more'	blob \| diff \| raw
2019-04-25	Merge branch 'sg/test-atexit'	blob \| diff \| raw
2019-04-25	Merge branch 'ag/sequencer-reduce-rewriting-todo'	blob \| diff \| raw
2019-04-25	Merge branch 'bp/post-index-change-hook'	blob \| diff \| raw
2019-04-22	Merge branch 'da/smerge'	blob \| diff \| raw
2019-04-22	Merge branch 'dl/flex-str-cocci'	blob \| diff \| raw
2019-04-22	Merge branch 'js/spell-out-options-in-tests'	blob \| diff \| raw
2019-04-22	Merge branch 'nd/read-tree-reset-doc'	blob \| diff \| raw
2019-04-22	Merge branch 'nd/interpret-trailers-docfix'	blob \| diff \| raw
2019-04-22	Merge branch 'sg/asciidoctor-in-ci'	blob \| diff \| raw
2019-04-22	Merge branch 'tz/asciidoctor-fixes'	blob \| diff \| raw
2019-04-22	Merge branch 'js/check-docs-exe'	blob \| diff \| raw
2019-04-22	Merge branch 'nd/include-if-wildmatch'	blob \| diff \| raw
2019-04-22	Merge branch 'cb/doco-mono'	blob \| diff \| raw
2019-04-22	Merge branch 'tg/stash-in-c-show-default-to-p-fix'	blob \| diff \| raw
2019-04-22	Merge branch 'js/stash-in-c-pathspec-fix'	blob \| diff \| raw
2019-04-22	Merge branch 'tb/stash-in-c-unused-param-fix'	blob \| diff \| raw
2019-04-22	Merge branch 'ps/stash-in-c'	blob \| diff \| raw
2019-04-16	Merge branch 'sg/t5318-cleanup'	blob \| diff \| raw
2019-04-16	Merge branch 'jt/t5551-protocol-v2-does-not-have-half...	blob \| diff \| raw
2019-04-16	Merge branch 'jk/http-walker-status-fix'	blob \| diff \| raw
2019-04-16	Merge branch 'jh/midx-verify-too-many-packs'	blob \| diff \| raw
2019-04-16	Merge branch 'bb/unicode-12'	blob \| diff \| raw
2019-04-16	Merge branch 'jk/refs-double-abort'	blob \| diff \| raw
2019-04-16	Merge branch 'nd/checkout-m-doc-update'	blob \| diff \| raw
2019-04-16	Merge branch 'tb/trace2-va-list-fix'	blob \| diff \| raw
2019-04-16	Merge branch 'tz/completion'	blob \| diff \| raw
2019-04-16	Merge branch 'ma/doc-diff-doc-vs-doctor-comparison'	blob \| diff \| raw
2019-04-16	Merge branch 'tz/t4038-bash-redirect-target-workaround'	blob \| diff \| raw
2019-04-16	Merge branch 'ab/drop-scripted-rebase'	blob \| diff \| raw
2019-04-16	Merge branch 'jk/perf-lib-tee'	blob \| diff \| raw
2019-04-16	Merge branch 'ab/doc-misc-typofixes'	blob \| diff \| raw
2019-04-16	Merge branch 'mh/pack-protocol-doc-fix'	blob \| diff \| raw
2019-04-16	Merge branch 'tg/glossary-overlay'	blob \| diff \| raw
2019-04-16	Merge branch 'nd/checkout-f-while-conflicted-fix'	blob \| diff \| raw
2019-04-16	Merge branch 'pw/rerere-autoupdate'	blob \| diff \| raw
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-09	Merge branch 'jh/resize-convert-scratch-buffer'	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-02	doc: document --overwrite-ignore	blob \| diff \| raw \| diff to current
2019-03-20	Merge branch 'jk/virtual-objects-do-exist'	blob \| diff \| raw \| diff to current
2019-03-18	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2019-03-18	merge: tweak --rerere-autoupdate documentation	blob \| diff \| raw
2019-03-11	Merge branch 'js/rebase-recreate-merge'	blob \| diff \| raw \| diff to current
2019-03-07	Merge branch 'ab/receive-pack-use-after-free-fix'	blob \| diff \| raw \| diff to current
2019-03-07	Merge branch 'nd/split-index-null-base-fix'	blob \| diff \| raw \| diff to current
2019-03-07	Merge branch 'rj/prune-packed-excess-args'	blob \| diff \| raw \| diff to current
2019-03-07	Merge branch 'du/branch-show-current'	blob \| diff \| raw \| diff to current
2019-03-07	Merge branch 'aw/pretty-trailers'	blob \| diff \| raw \| diff to current
2019-02-14	Merge branch 'jc/no-grepping-for-strerror-in-tests'	blob \| diff \| raw \| diff to current
2019-02-14	Merge branch 'kd/t0028-octal-del-is-377-not-777'	blob \| diff \| raw \| diff to current
2019-02-14	Merge branch 'rj/sequencer-sign-off-header-static'	blob \| diff \| raw \| diff to current
2019-02-09	Merge branch 'tz/gpg-test-fix'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'jk/add-ignore-errors-bit-assignment-fix'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'ma/doc-diff-usage-fix'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'ab/diff-tree-doc-fix'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'ss/describe-dirty-in-the-right-directory'	blob \| diff \| raw \| diff to current
2019-02-07	Merge branch 'lt/date-human'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'sg/object-as-type-commit-graph-fix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'bp/checkout-new-branch-optim'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'jk/attr-macro-fix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'jk/add-ignore-errors-bit-assignment-fix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'cc/test-ref-store-typofix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'sg/obstack-cast-function-type-fix'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'jt/get-reference-with-commit-graph'	blob \| diff \| raw \| diff to current
2019-02-05	Merge branch 'sb/more-repo-in-api'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'js/add-e-clear-patch-before-stating'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'jk/remote-insteadof-cleanup'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'bc/sha-256'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'jt/fetch-pack-v2'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'jk/proto-v2-hidden-refs-fix'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'jk/save-getenv-result'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'cc/fetch-error-message-fix'	blob \| diff \| raw \| diff to current
2019-01-29	Merge branch 'cc/partial-clone-doc-typofix'	blob \| diff \| raw \| diff to current
2019-01-18	Merge branch 'js/gc-repack-close-before-remove'	blob \| diff \| raw \| diff to current
2019-01-18	Merge branch 'en/show-ref-doc-fix'	blob \| diff \| raw \| diff to current
2019-01-18	Merge branch 'ot/ref-filter-object-info'	blob \| diff \| raw \| diff to current
2019-01-18	Merge branch 'jk/dev-build-format-security'	blob \| diff \| raw \| diff to current
2019-01-15	Merge branch 'nd/the-index' into md/list-objects-filter...	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'km/rebase-doc-typofix'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'md/exclude-promisor-objects-fix-cleanup'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'sb/diff-color-moved-config-option-fixup'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'hn/highlight-sideband-keywords'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'cb/t5004-empty-tar-archive-fix'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'cb/openbsd-allows-reading-directory'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'hb/t0061-dot-in-path-fix'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'ab/commit-graph-progress-fix'	blob \| diff \| raw \| diff to current
2019-01-14	Merge branch 'md/list-lazy-objects-fix'	blob \| diff \| raw \| diff to current
2019-01-04	Merge branch 'mk/http-backend-kill-children-before...	blob \| diff \| raw \| diff to current
2019-01-04	Merge branch 'sg/clone-initial-fetch-configuration'	blob \| diff \| raw \| diff to current
2019-01-04	Merge branch 'nd/the-index'	blob \| diff \| raw \| diff to current
2019-01-04	Merge branch 'jk/loose-object-cache'	blob \| diff \| raw \| diff to current
2019-01-04	Merge branch 'fc/http-version'	blob \| diff \| raw \| diff to current
next