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

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

2017-09-28	Merge branch 'mk/diff-delta-uint-may-be-shorter-than...	blob \| diff \| raw
2017-09-28	Merge branch 'rs/mailinfo-qp-decode-fix'	blob \| diff \| raw
2017-09-28	Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'	blob \| diff \| raw
2017-09-28	Merge branch 'ik/userdiff-html-h-element-fix'	blob \| diff \| raw
2017-09-28	Merge branch 'jk/diff-blob'	blob \| diff \| raw
2017-09-28	Merge branch 'hn/typofix'	blob \| diff \| raw
2017-09-28	Merge branch 'ic/fix-filter-branch-to-handle-tag-withou...	blob \| diff \| raw
2017-09-28	Merge branch 'jk/describe-omit-some-refs'	blob \| diff \| raw
2017-09-26	Sync with 2.14.2	blob \| diff \| raw
2017-09-25	Merge branch 'ks/test-readme-phrasofix'	blob \| diff \| raw
2017-09-25	Merge branch 'ow/rev-parse-is-shallow-repo'	blob \| diff \| raw
2017-09-25	Merge branch 'rj/test-ulimit-on-windows'	blob \| diff \| raw
2017-09-25	Merge branch 'jk/info-alternates-fix'	blob \| diff \| raw
2017-09-25	Merge branch 'mh/for-each-string-list-item-empty-fix'	blob \| diff \| raw
2017-09-25	Merge branch 'tb/test-lint-echo-e'	blob \| diff \| raw
2017-09-25	Merge branch 'ls/travis-scriptify'	blob \| diff \| raw
2017-09-25	Merge branch 'aw/gc-lockfile-fscanf-fix'	blob \| diff \| raw
2017-09-25	Merge branch 'hv/mv-nested-submodules-test'	blob \| diff \| raw
2017-09-25	Merge branch 'bw/git-clang-format'	blob \| diff \| raw
2017-09-25	Merge branch 'ks/commit-do-not-touch-cut-line'	blob \| diff \| raw
2017-09-25	Merge branch 'tg/refs-allowed-flags'	blob \| diff \| raw
2017-09-25	Merge branch 'rs/archive-excluded-directory'	blob \| diff \| raw
2017-09-25	Merge branch 'ks/help-alias-label'	blob \| diff \| raw
2017-09-25	Merge branch 'jk/write-in-full-fix'	blob \| diff \| raw
2017-09-25	Merge branch 'ez/doc-duplicated-words-fix'	blob \| diff \| raw
2017-09-25	Merge branch 'kd/doc-for-each-ref'	blob \| diff \| raw
2017-09-25	Merge branch 'cc/subprocess-handshake-missing-capabilities'	blob \| diff \| raw
2017-09-25	Merge branch 'kw/write-index-reduce-alloc'	blob \| diff \| raw
2017-09-25	Merge branch 'mg/name-rev-tests-with-short-stack'	blob \| diff \| raw
2017-09-21	Merge branch 'jk/leak-checkers'	blob \| diff \| raw
2017-09-20	Merge branch 'jk/describe-omit-some-refs' into mk/descr...	blob \| diff \| raw
2017-09-19	Merge branch 'rk/commit-tree-make-F-verbatim'	blob \| diff \| raw
2017-09-19	Merge branch 'rs/strbuf-leakfix'	blob \| diff \| raw
2017-09-19	Merge branch 'jk/shortlog-ident-cleanup'	blob \| diff \| raw
2017-09-19	Merge branch 'mh/packed-ref-transactions'	blob \| diff \| raw
2017-09-19	Merge branch 'kw/merge-recursive-cleanup'	blob \| diff \| raw
2017-09-19	Merge branch 'sb/merge-commit-msg-hook'	blob \| diff \| raw
2017-09-19	Merge branch 'jk/leak-checkers'	blob \| diff \| raw
2017-09-19	Merge branch 'nm/pull-submodule-recurse-config'	blob \| diff \| raw
2017-09-19	Merge branch 'mh/packed-ref-store-prep'	blob \| diff \| raw
2017-09-19	Merge branch 'ma/remove-config-maybe-bool'	blob \| diff \| raw
2017-09-19	Merge branch 'jk/system-path-cleanup'	blob \| diff \| raw
2017-09-19	Merge branch 'jh/hashmap-disable-counting'	blob \| diff \| raw
2017-09-19	Merge branch 'bb/doc-eol-dirty'	blob \| diff \| raw
2017-09-19	Merge branch 'jt/packmigrate'	blob \| diff \| raw
2017-09-19	Merge branch 'jk/incore-lockfile-removal'	blob \| diff \| raw
2017-09-19	Merge branch 'nd/prune-in-worktree'	blob \| diff \| raw
2017-09-19	Merge branch 'ma/split-symref-update-fix'	blob \| diff \| raw
2017-09-19	Merge branch 'mh/notes-cleanup'	blob \| diff \| raw
2017-09-19	Merge branch 'mg/timestamp-t-fix'	blob \| diff \| raw
2017-09-19	Merge branch 'ma/pkt-line-leakfix'	blob \| diff \| raw
2017-09-19	Merge branch 'jk/config-lockfile-leak-fix'	blob \| diff \| raw
2017-09-19	Merge branch 'dw/diff-highlight-makefile-fix'	blob \| diff \| raw
2017-09-19	Merge branch 'ti/external-sha1dc'	blob \| diff \| raw
2017-09-10	Sync with maint	blob \| diff \| raw
2017-09-10	Merge branch 'rs/apply-epoch'	blob \| diff \| raw
2017-09-10	Merge branch 'jk/drop-sha1-entry-pos'	blob \| diff \| raw
2017-09-10	Merge branch 'nd/worktree-kill-parse-ref'	blob \| diff \| raw
2017-09-10	Merge branch 'mm/send-email-cc-cruft'	blob \| diff \| raw
2017-09-10	Merge branch 'ls/convert-filter-progress'	blob \| diff \| raw
2017-09-10	Merge branch 'ma/up-to-date'	blob \| diff \| raw
2017-08-23	treewide: correct several "up-to-date" to "up to date"	blob \| diff \| raw
2017-07-30	Merge tag 'v2.8.6' into maint-2.9	blob \| diff \| raw \| diff to current
2017-07-30	Merge tag 'v2.7.6' into maint-2.8	blob \| diff \| raw \| diff to current
2017-07-25	Merge branch 'js/msgfmt-on-windows' of ../git-gui into...	blob \| diff \| raw \| diff to current
2017-06-24	Merge branch 'jc/diff-tree-stale-comment' into maint	blob \| diff \| raw \| diff to current
2017-06-24	Merge branch 'jk/pack-idx-corruption-safety' into maint	blob \| diff \| raw \| diff to current
2017-06-13	Merge branch 'jk/pack-idx-corruption-safety'	blob \| diff \| raw \| diff to current
2017-06-13	Merge branch 'jc/diff-tree-stale-comment'	blob \| diff \| raw \| diff to current
2017-06-05	Merge branch 'sg/core-filemode-doc-typofix' into maint	blob \| diff \| raw \| diff to current
2017-05-29	Merge branch 'sg/core-filemode-doc-typofix'	blob \| diff \| raw \| diff to current
2017-05-05	Merge branch 'maint-2.8' into maint-2.9	blob \| diff \| raw \| diff to current
2017-05-05	Merge branch 'maint-2.7' into maint-2.8	blob \| diff \| raw \| diff to current
2017-05-01	Merge branch 'jk/prio-queue-avoid-swap-with-self'	blob \| diff \| raw \| diff to current
2017-04-24	Merge branch 'xy/format-patch-base'	blob \| diff \| raw \| diff to current
2017-04-17	Merge branch 'jc/bs-t-is-not-a-tab-for-sed'	blob \| diff \| raw \| diff to current
2017-04-17	Merge branch 'jc/unused-symbols'	blob \| diff \| raw \| diff to current
2017-04-11	Merge branch 'cc/untracked'	blob \| diff \| raw \| diff to current
2017-03-30	Merge branch 'bc/push-cert-receive-fix'	blob \| diff \| raw \| diff to current
2017-03-30	Merge branch 'jc/merge-drop-old-syntax'	blob \| diff \| raw \| diff to current
2017-03-28	Merge branch 'rs/path-name-safety-cleanup' into maint	blob \| diff \| raw \| diff to current
2017-03-28	Merge branch 'js/regexec-buf' into maint	blob \| diff \| raw \| diff to current
2017-03-24	Merge branch 'rs/path-name-safety-cleanup'	blob \| diff \| raw \| diff to current
2017-03-24	Merge branch 'js/regexec-buf'	blob \| diff \| raw \| diff to current
2017-03-21	Merge branch 'jc/diff-populate-filespec-size-only-fix...	blob \| diff \| raw \| diff to current
2017-03-21	Merge branch 'jk/ewah-use-right-type-in-sizeof' into...	blob \| diff \| raw \| diff to current
2017-03-13	Merge branch 'jc/diff-populate-filespec-size-only-fix'	blob \| diff \| raw \| diff to current
2017-03-13	Merge branch 'jk/ewah-use-right-type-in-sizeof'	blob \| diff \| raw \| diff to current
2017-02-24	Merge branch 'bc/worktree-doc-fix-detached'	blob \| diff \| raw \| diff to current
2017-02-24	Merge branch 'rt/align-add-i-help-text'	blob \| diff \| raw \| diff to current
2017-02-24	Merge branch 'bc/blame-doc-fix'	blob \| diff \| raw \| diff to current
2017-02-16	Merge branch 'ls/p4-path-encoding'	blob \| diff \| raw \| diff to current
2017-02-15	Merge branch 'sb/doc-unify-bottom'	blob \| diff \| raw \| diff to current
2017-02-10	Merge branch 'ps/worktree-prune-help-fix'	blob \| diff \| raw \| diff to current
2017-02-02	Merge branch 'mm/reset-facl-before-umask-test'	blob \| diff \| raw \| diff to current
2017-02-02	Merge branch 'ws/request-pull-code-cleanup' into maint	blob \| diff \| raw \| diff to current
2017-01-31	Merge branch 'ad/bisect-terms' into maint	blob \| diff \| raw \| diff to current
2017-01-31	Merge branch 'jk/grep-e-could-be-extended-beyond-posix...	blob \| diff \| raw \| diff to current
2017-01-31	Merge branch 'km/branch-get-push-while-detached' into...	blob \| diff \| raw \| diff to current
2017-01-31	Merge branch 'jc/latin-1' into maint	blob \| diff \| raw \| diff to current
next