Merge branch 'jk/quote-env-path-list-component' into next
[git] / builtin / difftool.c
2017-03-24  Junio C HamanoMerge branch 'jk/quote-env-path-list-component' into...
2017-03-23  Junio C HamanoMerge branch 'js/rebase-helper'
2017-03-23  Junio C HamanoMerge branch 'bw/submodule-is-active' into next
2017-03-23  Junio C HamanoMerge branch 'sb/checkout-recurse-submodules' into...
2017-03-21  Junio C HamanoMerge branch 'bw/grep-recurse-submodules' into next
2017-03-21  Junio C HamanoSync with maint
2017-03-21  Junio C HamanoMerge branch 'nd/commit-hook-doc-fix'
2017-03-21  Junio C HamanoMerge branch 'ab/push-default-doc-fix'
2017-03-21  Junio C HamanoMerge branch 'ab/doc-no-option-notation-fix'
2017-03-21  Junio C HamanoMerge branch 'sb/wt-status-cleanup'
2017-03-21  Junio C HamanoMerge branch 'js/rebase-helper'
2017-03-21  Junio C HamanoMerge branch 'nd/conditional-config-include'
2017-03-21  Junio C HamanoMerge branch 'jk/pack-name-cleanups'
2017-03-21  Junio C HamanoMerge branch 'sb/submodule-config-parse-ignore-fix'
2017-03-21  Junio C HamanoMerge branch 'mg/prompt-describe-tags'
2017-03-21  Junio C HamanoMerge branch 'jk/rev-parse-cleanup'
2017-03-21  Junio C HamanoMerge branch 'jh/send-email-one-cc' into maint
2017-03-21  Junio C HamanoMerge branch 'jk/t6300-cleanup' into maint
2017-03-21  Junio C HamanoMerge branch 'rs/commit-parsing-optim' into maint
2017-03-21  Junio C HamanoMerge branch 'jk/show-branch-lift-name-len-limit' into...
2017-03-21  Junio C HamanoMerge branch 'jk/tempfile-ferror-fclose-confusion'...
2017-03-21  Junio C HamanoMerge branch 'rl/remote-allow-missing-branch-name-merge...
2017-03-21  Junio C HamanoMerge branch 'dt/gc-ignore-old-gc-logs' into maint
2017-03-21  Junio C HamanoMerge branch 'jt/upload-pack-error-report' into maint
2017-03-21  Junio C HamanoMerge branch 'rs/sha1-file-plug-fallback-base-leak...
2017-03-21  Junio C HamanoMerge branch 'jc/diff-populate-filespec-size-only-fix...
2017-03-21  Junio C HamanoMerge branch 'mg/status-porcelain-no-i18n' into maint
2017-03-21  Junio C HamanoMerge branch 'ew/markdown-url-in-readme' into maint
2017-03-21  Junio C HamanoMerge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-20  Junio C HamanoMerge branch 'jk/sha1dc' into next
2017-03-20  Junio C HamanoMerge branch 'nd/commit-hook-doc-fix' into next
2017-03-20  Junio C HamanoMerge branch 'ab/push-default-doc-fix' into next
2017-03-20  Junio C HamanoMerge branch 'ab/doc-no-option-notation-fix' into next
2017-03-20  Junio C HamanoMerge branch 'sg/test-with-stdin' into next
2017-03-20  Junio C HamanoMerge branch 'rs/update-hook-optim' into next
2017-03-20  Junio C HamanoMerge branch 'rs/shortlog-cleanup' into next
2017-03-20  Junio C HamanoMerge branch 'rs/path-name-safety-cleanup' into next
2017-03-20  Junio C HamanoMerge branch 'rs/http-push-cleanup' into next
2017-03-20  Junio C HamanoMerge branch 'js/regexec-buf' into next
2017-03-20  Junio C HamanoMerge branch 'jk/execv-dashed-external' into next
2017-03-20  Junio C HamanoMerge branch 'dl/credential-cache-socket-in-xdg-cache...
2017-03-20  Junio C HamanoMerge branch 'sb/wt-status-cleanup' into next
2017-03-20  Junio C HamanoMerge branch 'js/rebase-helper' into next
2017-03-20  Junio C HamanoSync with 2.12.1
2017-03-20  Junio C HamanoMerge branch 'js/difftool-builtin'
2017-03-17  Junio C HamanoSync with master
2017-03-17  Junio C HamanoMerge branch 'nd/conditional-config-include' into next
2017-03-17  Junio C HamanoMerge branch 'jk/cherry-pick-0-mainline'
2017-03-17  Junio C HamanoMerge branch 'mg/status-porcelain-no-i18n'
2017-03-17  Junio C HamanoMerge branch 'rs/blame-code-cleanup'
2017-03-17  Junio C HamanoMerge branch 'cc/split-index-config'
2017-03-16  Junio C HamanoMerge branch 'master' into next
2017-03-16  Junio C HamanoMerge branch 'mm/two-more-xstrfmt' into maint
2017-03-16  Junio C HamanoMerge branch 'vn/line-log-memcpy-size-fix' into maint
2017-03-16  Junio C HamanoMerge branch 'ax/line-log-range-merge-fix' into maint
2017-03-16  Junio C HamanoMerge branch 'js/travis-32bit-linux' into maint
2017-03-16  Junio C HamanoMerge branch 'jh/mingw-openssl-sha1' into maint
2017-03-16  Junio C HamanoMerge branch 'jk/http-auth' into maint
2017-03-16  Junio C HamanoMerge branch 'jk/pack-name-cleanups' into next
2017-03-16  Junio C HamanoMerge branch 'sb/submodule-config-parse-ignore-fix...
2017-03-16  Junio C HamanoMerge branch 'mg/prompt-describe-tags' into next
2017-03-16  Junio C HamanoMerge branch 'js/difftool-builtin' into next
2017-03-16  Junio C HamanoMerge branch 'jk/cherry-pick-0-mainline' into next
2017-03-15  David Aguilardifftool: handle modified symlinks in dir-diff mode
2017-03-14  Junio C HamanoMerge branch 'mg/status-porcelain-no-i18n' into next
2017-03-14  Junio C HamanoMerge branch 'kn/ref-filter-branch-list'
2017-03-14  Junio C HamanoMerge branch 'jk/push-deadlock-regression-fix'
2017-03-14  Junio C HamanoMerge branch 'js/travis-32bit-linux'
2017-03-14  Junio C HamanoMerge branch 'dp/filter-branch-prune-empty'
2017-03-14  Junio C HamanoMerge branch 'mm/fetch-show-error-message-on-unadvertis...
2017-03-14  Junio C HamanoMerge branch 'jk/interpret-branch-name'
2017-03-14  Junio C HamanoMerge branch 'ab/cond-skip-tests'
2017-03-13  Junio C HamanoMerge branch 'rs/blame-code-cleanup' into next
2017-03-13  Junio C HamanoMerge branch 'cc/split-index-config' into next
2017-03-13  Junio C HamanoMerge branch 'jc/diff-populate-filespec-size-only-fix'
2017-03-13  Junio C HamanoMerge branch 'vn/line-log-memcpy-size-fix'
2017-03-13  Junio C HamanoMerge branch 'jk/ewah-use-right-type-in-sizeof'
2017-03-13  Junio C HamanoMerge branch 'ax/line-log-range-merge-fix'
2017-03-13  Junio C HamanoMerge branch 'jh/mingw-openssl-sha1'
2017-03-10  Junio C HamanoMerge branch 'kn/ref-filter-branch-list' into next
2017-03-10  Junio C HamanoMerge branch 'jk/push-deadlock-regression-fix' into...
2017-03-10  Junio C HamanoMerge branch 'js/travis-32bit-linux' into next
2017-03-10  Junio C HamanoMerge branch 'vn/line-log-memcpy-size-fix' into next
2017-03-10  Junio C HamanoMerge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-10  Junio C HamanoMerge branch 'dp/filter-branch-prune-empty' into next
2017-03-10  Junio C HamanoMerge branch 'ax/line-log-range-merge-fix' into next
2017-03-10  Junio C HamanoMerge branch 'mm/fetch-show-error-message-on-unadvertis...
2017-03-10  Junio C HamanoMerge branch 'jc/diff-populate-filespec-size-only-fix...
2017-03-10  Junio C HamanoMerge branch 'jk/interpret-branch-name' into next
2017-03-10  Junio C HamanoMerge branch 'ab/cond-skip-tests' into next
2017-03-10  Junio C HamanoMerge branch 'jh/mingw-openssl-sha1' into next
2017-03-10  Junio C HamanoMerge branch 'rs/log-email-subject'
2017-03-10  Junio C HamanoMerge branch 'tg/stash-push'
2017-03-10  Junio C HamanoMerge branch 'ew/markdown-url-in-readme'
2017-03-10  Junio C HamanoMerge branch 'jk/http-auth'
2017-03-10  Junio C HamanoMerge branch 'jh/send-email-one-cc'
2017-03-10  Junio C HamanoMerge branch 'rs/strbuf-add-real-path'
2017-03-10  Junio C HamanoMerge branch 'rs/sha1-file-plug-fallback-base-leak'
2017-03-10  Junio C HamanoMerge branch 'rs/commit-parsing-optim'
2017-03-10  Junio C HamanoMerge branch 'jk/t6300-cleanup'
next