Merge branch 'tg/range-diff-output-update'
[git] / builtin / difftool.c
2019-10-15  Junio C HamanoMerge branch 'tg/range-diff-output-update'
2019-10-15  Junio C HamanoMerge branch 'gs/sq-quote-buf-pretty'
2019-10-15  Junio C HamanoMerge branch 'ew/hashmap'
2019-10-09  Junio C HamanoMerge branch 'rs/convert-fix-utf-without-dash'
2019-10-09  Junio C HamanoMerge branch 'as/shallow-slab-use-fix'
2019-10-07  Junio C HamanoMerge branch 'dl/submodule-set-branch'
2019-10-07  Junio C HamanoMerge branch 'jk/list-objects-optim-wo-trees'
2019-10-07  Eric Wonghashmap: remove type arg from hashmap_{get,put,remove...
2019-10-07  Eric WongOFFSETOF_VAR macro to simplify hashmap iterators
2019-10-07  Eric Wonghashmap: use *_entry APIs for iteration
2019-10-07  Eric Wonghashmap_cmp_fn takes hashmap_entry params
2019-10-07  Eric Wonghashmap_get{,_from_hash} return "struct hashmap_entry *"
2019-10-07  Eric Wonghashmap_get takes "const struct hashmap_entry *"
2019-10-07  Eric Wonghashmap_add takes "struct hashmap_entry *"
2019-10-07  Eric Wonghashmap_entry_init takes "struct hashmap_entry *"
2019-09-30  Junio C HamanoMerge branch 'tg/push-all-in-mirror-forbidden'
2019-09-30  Junio C HamanoMerge branch 'nd/switch-and-restore'
2019-09-30  Junio C HamanoMerge branch 'rs/trace2-dst-warning'
2019-09-18  Junio C HamanoMerge branch 'master' of https://github.com/prati0100...
2019-09-17  Junio C HamanoMerge gitk to pick up emergency build fix
2019-09-16  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2019-09-09  Junio C HamanoMerge branch 'mp/for-each-ref-missing-name-or-email'
2019-09-09  Junio C HamanoMerge branch 'nd/diff-parseopt'
2019-09-09  Junio C HamanoMerge branch 'rs/pax-extended-header-length-fix'
2019-09-09  Junio C HamanoMerge branch 'en/checkout-mismerge-fix'
2019-08-22  Junio C HamanoMerge branch 'rs/nedalloc-fixlets'
2019-08-09  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index...
2019-08-09  Junio C HamanoMerge branch 'ds/commit-graph-incremental'
2019-08-08  Junio C HamanoMerge branch 'nd/switch-and-restore'
2019-08-07  Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github...
2019-07-29  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index'
2019-07-29  Junio C HamanoMerge branch 'bb/grep-pcre2-bug-message-fix'
2019-07-29  Junio C HamanoMerge branch 'fc/fetch-with-import-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'ds/close-object-store' into maint
2019-07-29  Junio C HamanoMerge branch 'pw/add-p-recount' into maint
2019-07-29  Junio C HamanoMerge branch 'jk/trailers-use-config' into maint
2019-07-29  Junio C HamanoMerge branch 'pw/rebase-abort-clean-rewritten' into...
2019-07-29  Junio C HamanoMerge branch 'nd/completion-no-cache-failure' into...
2019-07-29  Junio C HamanoMerge branch 'jk/delta-islands-progress-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'ms/submodule-foreach-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'js/rebase-reschedule-applies-only-to...
2019-07-29  Junio C HamanoMerge branch 'jc/denoise-rm-to-resolve' into maint
2019-07-29  Junio C HamanoMerge branch 'sr/gpg-interface-stop-at-the-end' into...
2019-07-29  Junio C HamanoMerge branch 'po/doc-branch' into maint
2019-07-29  Junio C HamanoMerge branch 'dl/config-alias-doc' into maint
2019-07-29  Junio C HamanoMerge branch 'cb/fsmonitor-intfix' into maint
2019-07-29  Junio C HamanoMerge branch 'js/t3404-typofix' into maint
2019-07-29  Junio C HamanoMerge branch 'jt/t5551-test-chunked' into maint
2019-07-29  Junio C HamanoMerge branch 'rm/gpg-program-doc-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'js/unmap-before-ext-diff' into maint
2019-07-25  Junio C HamanoMerge branch 'ab/hash-object-doc' into maint
2019-07-25  Junio C HamanoMerge branch 'cm/send-email-document-req-modules' into...
2019-07-25  Junio C HamanoMerge branch 'sw/git-p4-unshelve-branched-files' into...
2019-07-25  Junio C HamanoMerge branch 'js/bisect-helper-check-get-oid-return...
2019-07-25  Junio C HamanoMerge branch 'es/git-debugger-doc' into maint
2019-07-25  Junio C HamanoMerge branch 'md/url-parse-harden' into maint
2019-07-25  Junio C HamanoMerge branch 'an/ignore-doc-update' into maint
2019-07-25  Junio C HamanoMerge branch 'md/list-objects-filter-memfix' into maint
2019-07-25  Junio C HamanoMerge branch 'jt/partial-clone-missing-ref-delta-base...
2019-07-25  Junio C HamanoMerge branch 'pb/request-pull-verify-remote-ref' into...
2019-07-25  Junio C HamanoMerge branch 'mm/p4-unshelve-windows-fix' into maint
2019-07-25  Junio C HamanoMerge branch 'bb/unicode-12.1-reiwa' into maint
2019-07-25  Junio C HamanoMerge branch 'js/fsmonitor-unflake' into maint
2019-07-25  Junio C HamanoMerge branch 'vv/merge-squash-with-explicit-commit...
2019-07-25  Junio C HamanoMerge branch 'js/bundle-verify-require-object-store...
2019-07-25  Junio C HamanoMerge branch 'jk/am-i-resolved-fix' into maint
2019-07-25  Junio C HamanoMerge branch 'jk/HEAD-symref-in-xfer-namespaces' into...
2019-07-25  Junio C HamanoMerge branch 'es/grep-require-name-when-needed' into...
2019-07-25  Junio C HamanoMerge branch 'ds/object-info-for-prefetch-fix' into...
2019-07-25  Junio C HamanoMerge branch 'mh/import-transport-fd-fix' into maint
2019-07-25  Junio C HamanoMerge branch 'nd/corrupt-worktrees' into maint
2019-07-25  Junio C HamanoMerge branch 'nd/init-relative-template-fix' into maint
2019-07-25  Junio C HamanoMerge branch 'jc/denoise-rm-to-resolve'
2019-07-25  Junio C HamanoMerge branch 'sr/gpg-interface-stop-at-the-end'
2019-07-25  Junio C HamanoMerge branch 'rm/gpg-program-doc-fix'
2019-07-25  Junio C HamanoMerge branch 'js/unmap-before-ext-diff'
2019-07-19  Junio C HamanoMerge branch 'jl/status-reduce-vertical-blank'
2019-07-19  Junio C HamanoMerge branch 'ew/repack-with-bitmaps-by-default'
2019-07-19  Junio C HamanoMerge branch 'ds/commit-graph-incremental'
2019-07-19  Junio C HamanoMerge branch 'br/blame-ignore'
2019-07-11  Junio C HamanoMerge branch 'js/rebase-reschedule-applies-only-to...
2019-07-11  Junio C HamanoMerge branch 'jt/t5551-test-chunked'
2019-07-09  Junio C HamanoMerge branch 'ms/submodule-foreach-fix'
2019-07-09  Junio C HamanoMerge branch 'cc/first-contrib-tutorial'
2019-07-09  Junio C HamanoMerge branch 'ab/fail-prereqs-in-test'
2019-07-09  Junio C HamanoMerge branch 'nd/switch-and-restore'
2019-07-09  Junio C HamanoMerge branch 'jk/delta-islands-progress-fix'
2019-07-09  Junio C HamanoMerge branch 'md/sort-detached-head-first'
2019-07-09  Junio C HamanoMerge branch 'pw/rebase-abort-clean-rewritten'
2019-07-09  Junio C HamanoMerge branch 'am/p4-branches-excludes'
2019-07-09  Junio C HamanoMerge branch 'jk/trailers-use-config'
2019-07-09  Junio C HamanoMerge branch 'js/t3404-typofix'
2019-07-09  Junio C HamanoMerge branch 'pw/doc-synopsis-markup-opmode-options'
2019-07-09  Junio C HamanoMerge branch 'cb/fsmonitor-intfix'
2019-07-09  Junio C HamanoMerge branch 'pw/add-p-recount'
2019-07-09  Junio C HamanoMerge branch 'ds/close-object-store'
2019-07-09  Junio C HamanoMerge branch 'ds/commit-graph-write-refactor'
2019-07-09  Junio C HamanoMerge branch 'nd/completion-no-cache-failure'
2019-07-09  Junio C HamanoMerge branch 'dl/config-alias-doc'
2019-07-09  Junio C HamanoMerge branch 'fc/fetch-with-import-fix'
next