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

[git] / Documentation / merge-strategies.txt

2017-12-06	Junio C Hamano	Merge branch 'rs/apply-inaccurate-eof-with-incomplete...	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'tz/complete-branch-copy' into maint	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'sd/branch-copy' into maint	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'sw/pull-ipv46-passthru' into maint	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'mh/avoid-rewriting-packed-refs' into...	blob \| commitdiff \| raw
2017-11-27	Junio C Hamano	Merge branch 'rs/apply-fuzzy-match-fix' into maint	blob \| commitdiff \| raw
2017-11-27	Junio C Hamano	Merge branch 'rs/imap-send-next-arg-fix' into maint	blob \| commitdiff \| raw
2017-11-21	Junio C Hamano	Merge branch 'cb/t4201-robustify' into maint	blob \| commitdiff \| raw
2017-11-21	Junio C Hamano	Merge branch 'ad/rebase-i-serie-typofix' into maint	blob \| commitdiff \| raw
2017-11-21	Junio C Hamano	Merge branch 'jk/info-alternates-fix' into maint	blob \| commitdiff \| raw
2017-11-21	Junio C Hamano	Merge branch 'ab/pcre-v2' into maint	blob \| commitdiff \| raw
2017-11-21	Junio C Hamano	Merge branch 'bw/rebase-i-ignored-submodule-fix' into...	blob \| commitdiff \| raw
2017-11-15	Junio C Hamano	Merge branch 'dk/libsecret-unlock-to-load-fix' into...	blob \| commitdiff \| raw
2017-11-15	Junio C Hamano	Merge branch 'js/early-config' into maint	blob \| commitdiff \| raw
2017-11-15	Junio C Hamano	Merge branch 'ao/diff-populate-filespec-lstat-errorpath...	blob \| commitdiff \| raw
2017-11-15	Junio C Hamano	Merge branch 'jc/check-ref-format-oor' into maint	blob \| commitdiff \| raw
2017-11-15	Junio C Hamano	Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint	blob \| commitdiff \| raw
2017-11-15	Junio C Hamano	Merge branch 'bw/grep-recurse-submodules' into maint	blob \| commitdiff \| raw
2017-11-15	Junio C Hamano	Merge branch 'js/submodule-in-excluded' into maint	blob \| commitdiff \| raw
2017-11-15	Junio C Hamano	Merge branch 'kd/auto-col-with-pager-fix' into maint	blob \| commitdiff \| raw
2017-11-15	Junio C Hamano	Merge branch 'sg/travis-fixes' into maint	blob \| commitdiff \| raw
2017-11-09	Junio C Hamano	Merge branch 'tz/fsf-address-update' of ../git-gui...	blob \| commitdiff \| raw
2017-10-28	Junio C Hamano	Merge branch 'sg/rev-list-doc-reorder-fix'	blob \| commitdiff \| raw
2017-10-28	Junio C Hamano	Merge branch 'sb/rev-parse-show-superproject-root'	blob \| commitdiff \| raw
2017-10-28	Junio C Hamano	Merge branch 'ao/path-use-xmalloc'	blob \| commitdiff \| raw
2017-10-26	Junio C Hamano	Merge branch 'mh/ref-locking-fix'	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'jk/info-alternates-fix' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'jk/write-in-full-fix' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'rj/no-sign-compare' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'ma/ts-cleanups' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'ls/travis-scriptify' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'er/fast-import-dump-refs-on-checkpoint...	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'jt/fast-export-copy-modify-fix' into...	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'nd/worktree-kill-parse-ref' into maint	blob \| commitdiff \| raw
2017-10-19	Junio C Hamano	Merge branch 'jc/branch-force-doc-readability-fix'	blob \| commitdiff \| raw
2017-10-19	Junio C Hamano	Merge branch 'dg/filter-branch-filter-order-doc'	blob \| commitdiff \| raw
2017-10-19	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update'	blob \| commitdiff \| raw
2017-10-19	Junio C Hamano	Merge branch 'wk/merge-options-gpg-sign-doc'	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/ref-filter-colors-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jc/doc-checkout' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'tb/complete-describe' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/rs-mailmap' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/fsck-null-return-from-lookup' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/sha1-loose-object-info-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'sb/branch-avoid-repeated-strbuf-release...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/qsort-s' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jn/strbuf-doc-re-reuse' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/run-command-use-alloc-array' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/tag-null-pointer-arith-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/cocci-de-paren-call-params' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ad/doc-markup-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mr/doc-negative-pathspec' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/validate-headref-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ks/doc-use-camelcase-for-config-name...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/doc-read-tree-table-asciidoctor-fix...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'hn/typofix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ks/test-readme-phrasofix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ez/doc-duplicated-words-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'kd/doc-for-each-ref' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'cc/subprocess-handshake-missing-capabilit...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/system-path-cleanup' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'bb/doc-eol-dirty' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mg/timestamp-t-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ma/pkt-line-leakfix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/config-lockfile-leak-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'dw/diff-highlight-makefile-fix' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/drop-sha1-entry-pos' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'tb/ref-filter-empty-modifier' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rb/compat-poll-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'tg/memfixes' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ar/request-pull-phrasofix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jc/merge-x-theirs-docfix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/ref-filter-colors-fix'	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'js/rebase-i-final'	blob \| commitdiff \| raw
2017-10-17	Junio C Hamano	Merge branch 'sb/diff-color-move'	blob \| commitdiff \| raw
2017-10-17	Junio C Hamano	Merge branch 'js/rebase-i-final'	blob \| commitdiff \| raw
2017-10-17	Junio C Hamano	Merge branch 'jc/doc-checkout'	blob \| commitdiff \| raw
2017-10-11	Junio C Hamano	Merge branch 'ls/filter-process-delayed'	blob \| commitdiff \| raw
2017-10-11	Junio C Hamano	Merge branch 'tb/complete-describe'	blob \| commitdiff \| raw
2017-10-11	Junio C Hamano	Merge branch 'rs/rs-mailmap'	blob \| commitdiff \| raw
2017-10-11	Junio C Hamano	Merge branch 'rs/fsck-null-return-from-lookup'	blob \| commitdiff \| raw
2017-10-11	Junio C Hamano	Merge branch 'jk/sha1-loose-object-info-fix'	blob \| commitdiff \| raw
2017-10-11	Junio C Hamano	Merge branch 'hn/string-list-doc'	blob \| commitdiff \| raw
2017-10-09	Junio C Hamano	Merge branch 'js/rebase-i-final'	blob \| commitdiff \| raw
2017-10-08	Jiang Xin	Merge branch 'maint' of git://github.com/git-l10n/git-po	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'tb/ref-filter-empty-modifier'	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'ks/verify-filename-non-option-error-messa...	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'ks/branch-tweak-error-message-for-extra...	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'ma/builtin-unleak'	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'rb/compat-poll-fix'	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'tg/memfixes'	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'sb/branch-avoid-repeated-strbuf-release'	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'rs/qsort-s'	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'jn/strbuf-doc-re-reuse'	blob \| commitdiff \| raw
2017-10-05	Junio C Hamano	Merge branch 'ar/request-pull-phrasofix'	blob \| commitdiff \| raw
2017-10-05	Junio C Hamano	Merge branch 'rs/run-command-use-alloc-array'	blob \| commitdiff \| raw
2017-10-05	Junio C Hamano	Merge branch 'sb/git-clang-format'	blob \| commitdiff \| raw
2017-10-05	Junio C Hamano	Merge branch 'rs/tag-null-pointer-arith-fix'	blob \| commitdiff \| raw
2017-10-05	Junio C Hamano	Merge branch 'rs/cocci-de-paren-call-params'	blob \| commitdiff \| raw
next

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

RSS Atom