git.oblomov.eu Git - git/history - Documentation/merge-config.txt

[git] / Documentation / merge-config.txt

2018-01-22	Junio C Hamano	Merge branch 'bc/hash-algo' into maint	blob \| commitdiff \| raw
2018-01-11	Junio C Hamano	Merge branch 'jh/object-filtering'	blob \| commitdiff \| raw
2018-01-11	Junio C Hamano	Merge branch 'tg/worktree-create-tracking'	blob \| commitdiff \| raw
2018-01-11	Junio C Hamano	Merge branch 'js/test-with-ws-in-path'	blob \| commitdiff \| raw
2018-01-10	Junio C Hamano	Merge branch 'ew/empty-merge-with-dirty-index'	blob \| commitdiff \| raw
2018-01-10	Junio C Hamano	Merge branch 'ma/bisect-leakfix'	blob \| commitdiff \| raw
2018-01-10	Junio C Hamano	Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'jk/doc-diff-options'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'bw/protocol-v1'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'sg/travis-check-untracked'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'js/test-with-ws-in-path'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'bc/submitting-patches-in-asciidoc'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'sg/travis-skip-identical-test'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'ab/dc-sha1-loose-ends'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'sg/travis-fixes'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'js/misc-git-gui-stuff' of ../git-gui	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'js/sequencer-cleanups'	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'jh/memihash-opt'	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'tb/test-lint-wc-l'	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'rs/use-argv-array-in-child-process'	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'ld/p4-multiple-shelves'	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'jd/fix-strbuf-add-urlencode-bytes'	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'ew/empty-merge-with-dirty-index'	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'db/doc-config-section-names-with-bs'	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'jk/test-suite-tracing'	blob \| commitdiff \| raw
2017-12-31	Jiang Xin	Merge branch 'maint' of git://github.com/git-l10n/git-po	blob \| commitdiff \| raw
2017-12-28	Junio C Hamano	Merge branch 'sb/describe-blob'	blob \| commitdiff \| raw
2017-12-28	Junio C Hamano	Merge branch 'hi/merge-verify-sig-config'	blob \| commitdiff \| raw
2017-12-27	Junio C Hamano	Merge branch 'es/clone-shared-worktree'	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'rs/am-builtin-leakfix'	blob \| commitdiff \| raw \| diff to current
2017-12-12	Hans Jerry Illikainen	merge: add config option for verifySignatures	blob \| commitdiff \| raw
2017-12-05	Junio C Hamano	Merge branch 'ls/no-double-utf8-author-name' of .....	blob \| commitdiff \| raw \| diff to current
2017-11-22	Junio C Hamano	Merge branch 'jn/reproducible-build' of ../git-gui...	blob \| commitdiff \| raw \| diff to current
2017-11-09	Junio C Hamano	Merge branch 'tz/fsf-address-update' of ../git-gui...	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| commitdiff \| raw \| diff to current
2017-10-28	Junio C Hamano	Merge branch 'sg/rev-list-doc-reorder-fix'	blob \| commitdiff \| raw \| diff to current
2017-10-23	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-19	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update'	blob \| commitdiff \| raw \| diff to current
2017-09-10	Junio C Hamano	Merge branch 'rj/add-chmod-error-message' into maint	blob \| commitdiff \| raw \| diff to current
2017-08-22	Junio C Hamano	Merge branch 'rj/add-chmod-error-message'	blob \| commitdiff \| raw \| diff to current
2017-07-30	Junio C Hamano	Merge tag 'v2.8.6' into maint-2.9	blob \| commitdiff \| raw \| diff to current
2017-07-25	Junio C Hamano	Merge branch 'js/msgfmt-on-windows' of ../git-gui into...	blob \| commitdiff \| raw \| diff to current
2017-06-24	Junio C Hamano	Merge branch 'jc/diff-tree-stale-comment' into maint	blob \| commitdiff \| raw \| diff to current
2017-06-24	Junio C Hamano	Merge branch 'jk/pack-idx-corruption-safety' into maint	blob \| commitdiff \| raw \| diff to current
2017-06-13	Junio C Hamano	Merge branch 'jk/pack-idx-corruption-safety'	blob \| commitdiff \| raw \| diff to current
2017-06-13	Junio C Hamano	Merge branch 'jc/diff-tree-stale-comment'	blob \| commitdiff \| raw \| diff to current
2017-06-05	Junio C Hamano	Merge branch 'sg/core-filemode-doc-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2017-05-29	Junio C Hamano	Merge branch 'sg/core-filemode-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2017-05-05	Junio C Hamano	Merge branch 'maint-2.8' into maint-2.9	blob \| commitdiff \| raw \| diff to current
2017-05-01	Junio C Hamano	Merge branch 'jk/prio-queue-avoid-swap-with-self'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'xy/format-patch-base'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jc/bs-t-is-not-a-tab-for-sed'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jc/unused-symbols'	blob \| commitdiff \| raw \| diff to current
2017-04-11	Junio C Hamano	Merge branch 'cc/untracked'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'bc/push-cert-receive-fix'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'jc/merge-drop-old-syntax'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'rs/path-name-safety-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'js/regexec-buf' into maint	blob \| commitdiff \| raw \| diff to current
2017-03-24	Junio C Hamano	Merge branch 'rs/path-name-safety-cleanup'	blob \| commitdiff \| raw \| diff to current
2017-03-24	Junio C Hamano	Merge branch 'js/regexec-buf'	blob \| commitdiff \| raw \| diff to current
2017-03-21	Junio C Hamano	Merge branch 'jc/diff-populate-filespec-size-only-fix...	blob \| commitdiff \| raw \| diff to current
2017-03-21	Junio C Hamano	Merge branch 'jk/ewah-use-right-type-in-sizeof' into...	blob \| commitdiff \| raw \| diff to current
2017-03-13	Junio C Hamano	Merge branch 'jc/diff-populate-filespec-size-only-fix'	blob \| commitdiff \| raw \| diff to current
2017-03-13	Junio C Hamano	Merge branch 'jk/ewah-use-right-type-in-sizeof'	blob \| commitdiff \| raw \| diff to current
2017-02-24	Junio C Hamano	Merge branch 'bc/worktree-doc-fix-detached'	blob \| commitdiff \| raw \| diff to current
2017-02-24	Junio C Hamano	Merge branch 'rt/align-add-i-help-text'	blob \| commitdiff \| raw \| diff to current
2017-02-24	Junio C Hamano	Merge branch 'bc/blame-doc-fix'	blob \| commitdiff \| raw \| diff to current
2017-02-16	Junio C Hamano	Merge branch 'ls/p4-path-encoding'	blob \| commitdiff \| raw \| diff to current
2017-02-15	Junio C Hamano	Merge branch 'sb/doc-unify-bottom'	blob \| commitdiff \| raw \| diff to current
2017-02-10	Junio C Hamano	Merge branch 'ps/worktree-prune-help-fix'	blob \| commitdiff \| raw \| diff to current
2017-02-02	Junio C Hamano	Merge branch 'mm/reset-facl-before-umask-test'	blob \| commitdiff \| raw \| diff to current
2017-02-02	Junio C Hamano	Merge branch 'ws/request-pull-code-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-31	Junio C Hamano	Merge branch 'ad/bisect-terms' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-31	Junio C Hamano	Merge branch 'jk/grep-e-could-be-extended-beyond-posix...	blob \| commitdiff \| raw \| diff to current
2017-01-31	Junio C Hamano	Merge branch 'km/branch-get-push-while-detached' into...	blob \| commitdiff \| raw \| diff to current
2017-01-31	Junio C Hamano	Merge branch 'jc/latin-1' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-31	Junio C Hamano	Merge branch 'jk/vreport-sanitize'	blob \| commitdiff \| raw \| diff to current
2017-01-23	Junio C Hamano	Merge branch 'ws/request-pull-code-cleanup'	blob \| commitdiff \| raw \| diff to current
2017-01-23	Junio C Hamano	Merge branch 'ad/bisect-terms'	blob \| commitdiff \| raw \| diff to current
2017-01-23	Junio C Hamano	Merge branch 'jk/grep-e-could-be-extended-beyond-posix'	blob \| commitdiff \| raw \| diff to current
2017-01-18	Junio C Hamano	Merge branch 'sb/remove-gitview'	blob \| commitdiff \| raw \| diff to current
2017-01-18	Junio C Hamano	Merge branch 'km/branch-get-push-while-detached'	blob \| commitdiff \| raw \| diff to current
2017-01-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'mm/gc-safety-doc' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'mm/push-social-engineering-attack-doc...	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jt/fetch-no-redundant-tag-fetch-map'...	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'lr/doc-fix-cet' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'sb/t3600-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'sb/unpack-trees-grammofix' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'ak/lazy-prereq-mktemp' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'mk/mingw-winansi-ttyname-termination...	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jk/difftool-in-subdir' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jc/push-default-explicit' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jc/pull-rebase-ff' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jk/stash-disable-renames-internally'...	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jc/renormalize-merge-kill-safer-crlf...	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'bb/unicode-9.0' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-10	Junio C Hamano	Merge branch 'mm/gc-safety-doc'	blob \| commitdiff \| raw \| diff to current
2017-01-10	Junio C Hamano	Merge branch 'mm/push-social-engineering-attack-doc'	blob \| commitdiff \| raw \| diff to current
2017-01-10	Junio C Hamano	Merge branch 'jt/fetch-no-redundant-tag-fetch-map'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom