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

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

2018-01-11	Merge branch 'jh/object-filtering'	blob \| diff \| raw
2018-01-11	Merge branch 'js/test-with-ws-in-path'	blob \| diff \| raw
2018-01-10	Merge branch 'ma/bisect-leakfix'	blob \| diff \| raw
2018-01-10	Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'	blob \| diff \| raw
2018-01-09	Merge branch 'jk/doc-diff-options'	blob \| diff \| raw
2018-01-09	Merge branch 'bw/protocol-v1'	blob \| diff \| raw
2018-01-09	Merge branch 'sg/travis-check-untracked'	blob \| diff \| raw
2018-01-09	Merge branch 'js/test-with-ws-in-path'	blob \| diff \| raw
2018-01-09	Merge branch 'bc/submitting-patches-in-asciidoc'	blob \| diff \| raw
2018-01-09	Merge branch 'sg/travis-skip-identical-test'	blob \| diff \| raw
2018-01-09	Merge branch 'sg/travis-fixes'	blob \| diff \| raw
2018-01-09	Merge branch 'js/misc-git-gui-stuff' of ../git-gui	blob \| diff \| raw
2018-01-09	Merge branch 'ew/empty-merge-with-dirty-index-maint...	blob \| diff \| raw
2018-01-05	Merge branch 'jh/memihash-opt'	blob \| diff \| raw
2018-01-05	Merge branch 'jd/fix-strbuf-add-urlencode-bytes'	blob \| diff \| raw
2018-01-05	Merge branch 'db/doc-config-section-names-with-bs'	blob \| diff \| raw
2018-01-05	Merge branch 'jk/test-suite-tracing'	blob \| diff \| raw
2017-12-31	Merge branch 'maint' of git://github.com/git-l10n/git-po	blob \| diff \| raw
2017-12-28	Merge branch 'sb/describe-blob'	blob \| diff \| raw
2017-12-28	Merge branch 'ws/curl-http-proxy-over-https'	blob \| diff \| raw
2017-12-28	Merge branch 'sr/http-sslverify-config-doc'	blob \| diff \| raw
2017-12-28	Merge branch 'bp/fsmonitor'	blob \| diff \| raw
2017-12-28	Merge branch 'jt/transport-hide-vtable'	blob \| diff \| raw
2017-12-28	Merge branch 'tz/lib-git-svn-svnserve-tests'	blob \| diff \| raw
2017-12-28	Merge branch 'ra/prompt-eread-fix'	blob \| diff \| raw
2017-12-28	Merge branch 'bw/path-doc'	blob \| diff \| raw
2017-12-27	Merge branch 'rb/quick-install-doc'	blob \| diff \| raw
2017-12-27	Merge branch 'jt/transport-no-more-rsync'	blob \| diff \| raw
2017-12-27	Merge branch 'sg/travis-fixes'	blob \| diff \| raw
2017-12-27	Merge branch 'sb/test-helper-excludes'	blob \| diff \| raw
2017-12-27	Merge branch 'ot/pretty'	blob \| diff \| raw
2017-12-27	Merge branch 'es/clone-shared-worktree'	blob \| diff \| raw
2017-12-27	Merge branch 'tb/delimit-pretty-trailers-args-with...	blob \| diff \| raw
2017-12-27	Merge branch 'rs/fmt-merge-msg-leakfix'	blob \| diff \| raw
2017-12-27	Merge branch 'jk/cvsimport-quoting'	blob \| diff \| raw
2017-12-27	Merge branch 'db/doc-workflows-neuter-the-maintainer'	blob \| diff \| raw
2017-12-27	Merge branch 'rs/strbuf-read-once-reset-length'	blob \| diff \| raw
2017-12-27	Merge branch 'rs/fmt-merge-msg-string-leak-fix'	blob \| diff \| raw
2017-12-27	Merge branch 'rs/am-builtin-leakfix'	blob \| diff \| raw
2017-12-27	Merge branch 'tb/check-crlf-for-safe-crlf'	blob \| diff \| raw
2017-12-27	Merge branch 'jh/object-filtering'	blob \| diff \| raw
2017-12-22	Merge branch 'ew/empty-merge-with-dirty-index-maint...	blob \| diff \| raw
2017-12-19	Merge branch 'ls/editor-waiting-message'	blob \| diff \| raw
2017-12-19	Merge branch 'sg/setup-doc-update'	blob \| diff \| raw
2017-12-19	Merge branch 'bw/submodule-config-cleanup'	blob \| diff \| raw
2017-12-19	Merge branch 'bw/pathspec-match-submodule-boundary'	blob \| diff \| raw
2017-12-19	Merge branch 'en/merge-recursive-icase-removal'	blob \| diff \| raw
2017-12-13	Merge branch 'js/hashmap-update-sample'	blob \| diff \| raw
2017-12-13	Merge branch 'jk/no-optional-locks'	blob \| diff \| raw
2017-12-13	Merge branch 'jk/progress-delay-fix'	blob \| diff \| raw
2017-12-13	Merge branch 'ks/doc-checkout-previous'	blob \| diff \| raw
2017-12-13	Merge branch 'tg/t-readme-updates'	blob \| diff \| raw
2017-12-13	Merge branch 'pc/submodule-helper'	blob \| diff \| raw
2017-12-13	Merge branch 'jc/receive-pack-hook-doc'	blob \| diff \| raw
2017-12-06	Sync with maint	blob \| diff \| raw
2017-12-06	Merge branch 'jn/ssh-wrappers'	blob \| diff \| raw
2017-12-06	Merge branch 'bw/protocol-v1'	blob \| diff \| raw
2017-12-06	Merge branch 'sp/doc-info-attributes'	blob \| diff \| raw
2017-12-06	Merge branch 'ph/stash-save-m-option-fix'	blob \| diff \| raw
2017-12-06	Merge branch 'jk/fewer-pack-rescan'	blob \| diff \| raw
2017-12-06	Merge branch 'tg/deprecate-stash-save'	blob \| diff \| raw
2017-12-06	Merge branch 'rd/doc-notes-prune-fix'	blob \| diff \| raw
2017-12-06	Merge branch 'rd/man-reflog-add-n'	blob \| diff \| raw
2017-12-06	Merge branch 'rd/man-prune-progress'	blob \| diff \| raw
2017-12-06	Merge branch 'cc/git-packet-pm'	blob \| diff \| raw
2017-12-06	Merge branch 'tz/branch-doc-remove-set-upstream'	blob \| diff \| raw
2017-12-06	Merge branch 'cc/perf-run-config'	blob \| diff \| raw
2017-12-06	Merge branch 'sb/submodule-recursive-checkout-detach...	blob \| diff \| raw
2017-12-06	Merge branch 'jc/merge-base-fork-point-doc' into maint	blob \| diff \| raw \| diff to current
2017-12-06	Merge branch 'tz/redirect-fix' into maint	blob \| diff \| raw \| diff to current
2017-12-06	Merge branch 'tz/notes-error-to-stderr' into maint	blob \| diff \| raw \| diff to current
2017-12-06	Merge branch 'rs/apply-inaccurate-eof-with-incomplete...	blob \| diff \| raw \| diff to current
2017-12-06	Merge branch 'tz/complete-branch-copy' into maint	blob \| diff \| raw \| diff to current
2017-12-06	Merge branch 'sd/branch-copy' into maint	blob \| diff \| raw \| diff to current
2017-12-06	Merge branch 'sw/pull-ipv46-passthru' into maint	blob \| diff \| raw \| diff to current
2017-12-06	Merge branch 'mh/avoid-rewriting-packed-refs' into...	blob \| diff \| raw \| diff to current
2017-12-05	Merge branch 'ls/no-double-utf8-author-name' of .....	blob \| diff \| raw
2017-11-28	Sync with v2.15.1	blob \| diff \| raw
2017-11-28	Merge branch 'ma/branch-list-paginate'	blob \| diff \| raw
2017-11-28	Merge branch 'jc/branch-name-sanity'	blob \| diff \| raw
2017-11-28	Merge branch 'rs/config-write-section-fix' into maint	blob \| diff \| raw \| diff to current
2017-11-27	Sync with maint	blob \| diff \| raw
2017-11-27	Merge branch 'sw/pull-ipv46-passthru'	blob \| diff \| raw
2017-11-27	Merge branch 'ks/rebase-no-git-foo'	blob \| diff \| raw
2017-11-27	Merge branch 'rs/config-write-section-fix'	blob \| diff \| raw
2017-11-27	Merge branch 'ew/rebase-mboxrd'	blob \| diff \| raw
2017-11-27	Merge branch 'tb/add-renormalize'	blob \| diff \| raw
2017-11-27	Merge branch 'tz/complete-branch-copy'	blob \| diff \| raw
2017-11-27	Merge branch 'rs/apply-inaccurate-eof-with-incomplete...	blob \| diff \| raw
2017-11-27	Merge branch 'pw/sequencer-recover-from-unlockable...	blob \| diff \| raw
2017-11-27	Merge branch 'sd/branch-copy'	blob \| diff \| raw
2017-11-27	Merge branch 'sb/test-cherry-pick-submodule-getting...	blob \| diff \| raw
2017-11-27	Merge branch 'tz/notes-error-to-stderr'	blob \| diff \| raw
2017-11-27	Merge branch 'tz/redirect-fix'	blob \| diff \| raw
2017-11-27	Merge branch 'jc/merge-base-fork-point-doc'	blob \| diff \| raw
2017-11-27	Merge branch 'jc/ignore-cr-at-eol'	blob \| diff \| raw
2017-11-27	Merge branch 'rs/apply-fuzzy-match-fix' into maint	blob \| diff \| raw \| diff to current
2017-11-27	Merge branch 'rs/imap-send-next-arg-fix' into maint	blob \| diff \| raw \| diff to current
2017-11-22	Merge branch 'jn/reproducible-build' of ../git-gui...	blob \| diff \| raw
2017-11-21	Sync with maint	blob \| diff \| raw
next