merge-recursive: improve auto-merging messages with path collisions
[git] / notes.h
2018-09-17  Junio C HamanoMerge branch 'ab/fetch-tags-noclobber'
2018-09-17  Junio C HamanoMerge branch 'sg/doc-trace-appends'
2018-09-17  Junio C HamanoMerge branch 'jk/diff-rendered-docs'
2018-09-17  Junio C HamanoMerge branch 'rs/mailinfo-format-flowed'
2018-09-17  Junio C HamanoMerge branch 'tg/rerere-doc-updates'
2018-09-17  Junio C HamanoMerge branch 'es/format-patch-rangediff'
2018-09-17  Junio C HamanoMerge branch 'es/format-patch-interdiff'
2018-09-17  Junio C HamanoMerge branch 'cc/delta-islands'
2018-09-17  Junio C HamanoMerge branch 'jk/trailer-fixes'
2018-09-17  Junio C HamanoMerge branch 'sb/range-diff-colors'
2018-09-17  Junio C HamanoMerge branch 'nd/unpack-trees-with-cache-tree'
2018-09-17  Junio C HamanoMerge branch 'ds/reachable'
2018-09-17  Junio C HamanoMerge branch 'sb/submodule-update-in-c'
2018-09-17  Junio C HamanoMerge branch 'tg/rerere'
2018-09-17  Junio C HamanoMerge branch 'jk/branch-l-1-repurpose'
2018-09-17  Junio C HamanoMerge branch 'tg/conflict-marker-size'
2018-09-17  Junio C HamanoMerge branch 'ts/doc-build-manpage-xsl-quietly'
2018-09-17  Junio C HamanoMerge branch 'jk/rev-list-stdin-noop-is-ok'
2018-09-17  Junio C HamanoMerge branch 'bp/checkout-new-branch-optim'
2018-09-17  Junio C HamanoMerge branch 'sg/t1404-update-ref-test-timeout'
2018-09-17  Junio C HamanoMerge branch 'nd/clone-case-smashing-warning'
2018-09-17  Junio C HamanoMerge branch 'mk/http-backend-content-length'
2018-09-10  Junio C HamanoMerge branch 'mk/http-backend-content-length'
2018-09-04  Junio C HamanoMerge branch 'es/chain-lint-more'
2018-09-04  Junio C HamanoMerge branch 'es/freebsd-iconv-portability'
2018-09-04  Junio C HamanoMerge branch 'ds/commit-graph-lockfile-fix'
2018-09-04  Junio C HamanoMerge branch 'en/directory-renames-nothanks'
2018-09-04  Junio C HamanoMerge branch 'pw/rebase-i-author-script-fix'
2018-08-27  Junio C HamanoMerge branch 'ds/commit-graph-fsck'
2018-08-27  Junio C HamanoMerge branch 'js/range-diff'
2018-08-27  Junio C HamanoMerge branch 'sg/test-rebase-editor-fix'
2018-08-27  Junio C HamanoMerge branch 'ab/test-must-be-empty-for-master'
2018-08-27  Junio C HamanoMerge branch 'sg/t3420-autostash-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t3903-missing-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t7501-thinkofix'
2018-08-27  Junio C HamanoMerge branch 'sg/t0020-conversion-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t4051-fix'
2018-08-27  Junio C HamanoMerge branch 'js/larger-timestamps'
2018-08-27  Junio C HamanoMerge branch 'jk/use-compat-util-in-test-tool'
2018-08-27  Junio C HamanoMerge branch 'sg/test-must-be-empty'
2018-08-27  Junio C HamanoMerge branch 'rs/opt-updates'
2018-08-27  Junio C HamanoMerge branch 'ab/unconditional-free-and-null'
2018-08-27  Junio C HamanoMerge branch 'ep/worktree-quiet-option'
2018-08-27  Junio C HamanoMerge branch 'sm/branch-sort-config'
2018-08-27  Junio C HamanoMerge branch 'nd/config-core-checkstat-doc'
2018-08-22  Junio C HamanoMerge branch 'nd/pack-deltify-regression-fix'
2018-08-21  Jiang XinMerge branch 'maint' of git://github.com/git-l10n/git-po
2018-08-20  Junio C HamanoSync 'ds/multi-pack-index' to v2.19.0-rc0
2018-08-20  Junio C HamanoMerge branch 'ab/checkout-default-remote'
2018-08-20  Junio C HamanoMerge branch 'hn/highlight-sideband-keywords'
2018-08-20  Junio C HamanoMerge branch 'nd/cherry-pick-quit-fix'
2018-08-20  Junio C HamanoMerge branch 'sb/submodule-cleanup'
2018-08-20  Junio C HamanoMerge branch 'pw/rebase-i-merge-segv-fix'
2018-08-20  Junio C HamanoMerge branch 'pw/rebase-i-squash-number-fix'
2018-08-20  Junio C HamanoMerge branch 'sb/config-write-fix'
2018-08-20  Junio C HamanoMerge branch 'ab/submodule-relative-url-tests'
2018-08-20  Junio C HamanoMerge branch 'en/incl-forward-decl'
2018-08-20  Junio C HamanoMerge branch 'jh/partial-clone-doc'
2018-08-20  Junio C HamanoMerge branch 'sb/pull-rebase-submodule'
2018-08-20  Junio C HamanoMerge branch 'js/typofixes'
2018-08-17  Junio C HamanoMerge branch 'ar/t4150-am-scissors-test-fix'
2018-08-17  Junio C HamanoMerge branch 'en/t3031-title-fix'
2018-08-17  Junio C HamanoMerge branch 'rs/parse-opt-lithelp'
2018-08-17  Junio C HamanoMerge branch 'jk/merge-subtree-heuristics'
2018-08-15  Junio C HamanoMerge branch 'sb/histogram-less-memory'
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/fast-import-dump-refs-on-checkpoint...
2018-08-15  Junio C HamanoMerge branch 'jk/ui-color-always-to-auto'
2018-08-15  Elijah NewrenAdd missing includes and forward declarations
2018-08-02  Junio C HamanoMerge branch 'bc/sequencer-export-work-tree-as-well'
2018-08-02  Junio C HamanoMerge branch 'sg/httpd-test-unflake'
2018-08-02  Junio C HamanoMerge branch 'jk/has-uncommitted-changes-fix'
2018-07-24  Junio C HamanoMerge branch 'sb/blame-color'
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 'jk/empty-pick-fix'
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 '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-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-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'
next