merge-recursive: improve auto-merging messages with path collisions
[git] / userdiff.c
2018-08-15  Junio C HamanoMerge branch 'jk/banned-function'
2018-08-15  Junio C HamanoMerge branch 'en/merge-recursive-skip-fix'
2018-08-15  Junio C HamanoMerge branch 'jt/tag-following-with-proto-v2-fix'
2018-08-15  Junio C HamanoMerge branch 'jk/size-t'
2018-08-15  Junio C HamanoMerge branch 'sg/coccicheck-updates'
2018-08-15  Junio C HamanoMerge branch 'sb/histogram-less-memory'
2018-08-15  Junio C HamanoMerge branch 'nd/i18n'
2018-08-15  Junio C HamanoMerge branch 'hs/gpgsm'
2018-08-15  Junio C HamanoMerge branch 'bw/clone-ref-prefixes'
2018-08-15  Junio C HamanoMerge branch 'jk/core-use-replace-refs'
2018-08-15  Junio C HamanoMerge branch 'jh/json-writer'
2018-08-15  Junio C HamanoMerge branch 'bb/make-developer-pedantic'
2018-08-15  Junio C HamanoMerge branch 'es/diff-color-moved-fix'
2018-08-15  Junio C HamanoMerge branch 'bw/protocol-v2'
2018-08-15  Junio C HamanoMerge branch 'sg/travis-cocci-diagnose-failure'
2018-08-15  Junio C HamanoMerge branch 'js/t7406-recursive-submodule-update-order...
2018-08-15  Junio C HamanoMerge branch 'bw/fetch-pack-i18n'
2018-08-15  Junio C HamanoMerge branch 'sg/fast-import-dump-refs-on-checkpoint...
2018-08-15  Junio C HamanoMerge branch 'sb/trailers-docfix'
2018-08-15  Junio C HamanoMerge branch 'jk/ui-color-always-to-auto'
2018-08-14  Junio C HamanoMerge branch 'es/format-patch-interdiff' into es/format...
2018-08-13  Nguyễn Thái Ngọc Duyattr: remove an implicit dependency on the_index
2018-08-02  Junio C HamanoMerge branch 'jt/commit-graph-per-object-store'
2018-08-02  Junio C HamanoMerge branch 'es/chain-lint-in-subshell'
2018-08-02  Junio C HamanoMerge branch 'jt/tags-to-promised-blobs-fix'
2018-08-02  Junio C HamanoMerge branch 'jt/fetch-negotiator-skipping'
2018-08-02  Junio C HamanoMerge branch 'jm/send-email-tls-auth-on-batch'
2018-08-02  Junio C HamanoMerge branch 'bc/sequencer-export-work-tree-as-well'
2018-08-02  Junio C HamanoMerge branch 'en/t7405-recursive-submodule-conflicts'
2018-08-02  Junio C HamanoMerge branch 'en/t6036-merge-recursive-tests'
2018-08-02  Junio C HamanoMerge branch 'en/dirty-merge-fixes'
2018-08-02  Junio C HamanoMerge branch 'js/rebase-merge-octopus'
2018-08-02  Junio C HamanoMerge branch 'tb/grep-only-matching'
2018-08-02  Junio C HamanoMerge branch 'kg/gc-auto-windows-workaround'
2018-08-02  Junio C HamanoMerge branch 'jm/cache-entry-from-mem-pool'
2018-08-02  Junio C HamanoMerge branch 'jt/fetch-nego-tip'
2018-08-02  Junio C HamanoMerge branch 'en/t6042-insane-merge-rename-testcases'
2018-08-02  Junio C HamanoMerge branch 'sb/object-store-lookup'
2018-08-02  Junio C HamanoMerge branch 'is/parsing-line-range'
2018-08-02  Junio C HamanoMerge branch 'jt/fetch-pack-negotiator'
2018-08-02  Junio C HamanoMerge branch 'ab/checkout-default-remote'
2018-08-02  Junio C HamanoMerge branch 'sb/diff-color-move-more'
2018-08-02  Junio C HamanoMerge branch 'es/test-fixes'
2018-08-02  Junio C HamanoMerge branch 'ds/commit-graph-fsck'
2018-08-02  Junio C HamanoMerge branch 'jk/fsck-gitmodules-gently'
2018-08-02  Junio C HamanoMerge branch 'bc/object-id'
2018-08-02  Junio C HamanoMerge branch 'en/t6036-recursive-corner-cases'
2018-08-02  Junio C HamanoMerge branch 'sg/httpd-test-unflake'
2018-08-02  Junio C HamanoMerge branch 'bp/test-drop-caches-for-windows'
2018-08-02  Junio C HamanoMerge branch 'jk/has-uncommitted-changes-fix'
2018-07-24  Junio C HamanoMerge branch 'as/sequencer-customizable-comment-char'
2018-07-24  Junio C HamanoMerge branch 'sb/blame-color'
2018-07-24  Junio C HamanoMerge branch 'nd/command-list'
2018-07-24  Junio C HamanoMerge branch 'es/test-lint-one-shot-export'
2018-07-24  Junio C HamanoMerge branch 'wc/find-commit-with-pattern-on-detached...
2018-07-24  Junio C HamanoMerge branch 'jc/t3404-one-shot-export-fix'
2018-07-24  Junio C HamanoMerge branch 'mk/merge-in-sparse-checkout'
2018-07-24  Junio C HamanoMerge branch 'hs/push-cert-check-cleanup'
2018-07-24  Junio C HamanoMerge branch 'jk/empty-pick-fix'
2018-07-24  Junio C HamanoMerge branch 'bp/log-ref-write-fd-with-strbuf'
2018-07-24  Junio C HamanoMerge branch 'jt/partial-clone-fsck-connectivity'
2018-07-24  Junio C HamanoMerge branch 'bc/send-email-auto-cte'
2018-07-24  Junio C HamanoMerge branch 'bb/unicode-11-width'
2018-07-24  Junio C HamanoMerge branch 'bb/pedantic'
2018-07-24  Junio C HamanoMerge branch 'tb/config-default'
2018-07-24  Junio C HamanoMerge branch 'mh/fast-import-no-diff-delta-empty'
2018-07-24  Junio C HamanoMerge branch 'kn/userdiff-php'
2018-07-24  Junio C HamanoMerge branch 'jk/fetch-all-peeled-fix'
2018-07-24  Junio C HamanoMerge branch 'sb/submodule-move-head-error-msg'
2018-07-24  Junio C HamanoMerge branch 'sb/blame-color' into jk/banned-function
2018-07-18  Junio C HamanoMerge branch 'js/enhanced-version-info'
2018-07-18  Junio C HamanoMerge branch 'ms/core-icase-doc'
2018-07-18  Junio C HamanoMerge branch 'ds/commit-graph'
2018-07-18  Junio C HamanoMerge branch 'tz/exclude-doc-smallfixes'
2018-07-18  Junio C HamanoMerge branch 'bw/protocol-v2'
2018-07-18  Junio C HamanoMerge branch 'bw/config-refer-to-gitsubmodules-doc'
2018-07-18  Junio C HamanoMerge branch 'xy/format-patch-prereq-patch-id-fix'
2018-07-18  Junio C HamanoMerge branch 'ds/ewah-cleanup'
2018-07-16  Junio C HamanoMerge branch 'jc/t3404-one-shot-export-fix' into es...
2018-07-06  Kana Natsunouserdiff: support new keywords in PHP hunk header
2018-06-28  Junio C HamanoMerge branch 'pw/add-p-recount'
2018-06-28  Junio C HamanoMerge branch 'jk/fetch-all-peeled-fix'
2018-06-28  Junio C HamanoMerge branch 'ms/send-pack-honor-config'
2018-06-28  Junio C HamanoMerge branch 'jh/partial-clone'
2018-06-28  Junio C HamanoMerge branch 'as/safecrlf-quiet-fix'
2018-06-25  Junio C HamanoMerge branch 'sg/update-ref-stdin-cleanup'
2018-06-25  Junio C HamanoMerge branch 'nd/reject-empty-shallow-request'
2018-06-25  Junio C HamanoMerge branch 'ds/commit-graph-lockfile-fix'
2018-06-18  Junio C HamanoMerge branch 'es/make-no-iconv'
2018-06-18  Junio C HamanoMerge branch 'sg/t7406-chain-fix'
2018-06-18  Junio C HamanoMerge branch 'ks/branch-set-upstream'
2018-06-18  Junio C HamanoMerge branch 'jk/ewah-bounds-check'
2018-06-18  Junio C HamanoMerge branch 'sb/blame-color'
2018-06-18  Junio C HamanoMerge branch 'mw/doc-merge-enumfix'
2018-06-18  Junio C HamanoMerge branch 'en/rename-directory-detection'
2018-06-18  Junio C HamanoMerge branch 'rd/doc-remote-tracking-with-hyphen'
2018-06-18  Junio C HamanoMerge branch 'jl/zlib-restore-nul-termination'
2018-06-18  Junio C HamanoMerge branch 'km/doc-workflows-typofix'
2018-06-18  Junio C HamanoMerge branch 'rd/diff-options-typofix'
2018-06-18  Junio C HamanoMerge branch 'rd/comment-typofix-in-sha1-file'
next