Sync with maint
[git] / git-mergetool--lib.sh
2016-10-11  Junio C HamanoMerge branch 'jk/verify-packfile-gently' into maint
2016-10-11  Junio C HamanoMerge branch 'jc/verify-loose-object-header' into maint
2016-10-11  Junio C HamanoMerge branch 'rs/git-gui-use-modern-git-merge-syntax...
2016-10-11  Junio C HamanoMerge branch 'pb/rev-list-reverse-with-count' into...
2016-10-11  Junio C HamanoMerge branch 'jk/graph-padding-fix' into maint
2016-10-10  Junio C HamanoMerge branch 'jc/blame-reverse'
2016-10-10  Junio C HamanoMerge branch 'nd/shallow-deepen'
2016-10-10  Junio C HamanoMerge branch 'ak/curl-imap-send-explicit-scheme'
2016-10-06  Junio C HamanoMerge branch 'rs/c-auto-resets-attributes'
2016-10-06  Junio C HamanoMerge branch 'jk/graph-padding-fix'
2016-10-03  Junio C HamanoMerge branch 'pb/rev-list-reverse-with-count'
2016-10-03  Junio C HamanoMerge branch 'rs/git-gui-use-modern-git-merge-syntax'
2016-10-03  Junio C HamanoMerge branch 'jc/verify-loose-object-header'
2016-10-03  Junio C HamanoMerge branch 'nd/init-core-worktree-in-multi-worktree...
2016-10-03  Junio C HamanoMerge branch 'jk/ident-ai-canonname-could-be-null'...
2016-10-03  Junio C HamanoMerge branch 'jk/doc-cvs-update' into maint
2016-09-29  Junio C HamanoMerge branch 'jk/ident-ai-canonname-could-be-null'
2016-09-29  Junio C HamanoMerge branch 'jk/verify-packfile-gently'
2016-09-29  Junio C HamanoMerge branch 'ls/travis-homebrew-path-fix' into maint
2016-09-29  Junio C HamanoMerge branch 'js/regexec-buf' into maint
2016-09-29  Junio C HamanoMerge branch 'ep/doc-check-ref-format-example' into...
2016-09-29  Junio C HamanoMerge branch 'mm/config-color-ui-default-to-auto' into...
2016-09-29  Junio C HamanoMerge branch 'jk/reduce-gc-aggressive-depth' into maint
2016-09-29  Junio C HamanoMerge branch 'ew/http-do-not-forget-to-call-curl-multi...
2016-09-29  Junio C HamanoMerge branch 'jk/fix-remote-curl-url-wo-proto' into...
2016-09-29  Junio C HamanoMerge branch 'mr/vcs-svn-printf-ulong' into maint
2016-09-29  Junio C HamanoMerge branch 'rs/strbuf-remove-fix' into maint
2016-09-29  Junio C HamanoMerge branch 'rs/checkout-some-states-are-const' into...
2016-09-29  Junio C HamanoMerge branch 'bw/pathspec-remove-unused-extern-decl...
2016-09-26  Junio C HamanoMerge branch 'jk/doc-cvs-update'
2016-09-26  Junio C HamanoMerge branch 'ls/travis-homebrew-path-fix'
2016-09-26  Junio C HamanoMerge branch 'js/regexec-buf'
2016-09-26  Junio C HamanoMerge branch 'ep/doc-check-ref-format-example'
2016-09-26  Junio C HamanoMerge branch 'rs/c-auto-resets-attributes'
2016-09-26  Junio C HamanoMerge branch 'mm/config-color-ui-default-to-auto'
2016-09-26  Junio C HamanoMerge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26  Junio C HamanoMerge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-21  Junio C HamanoMerge branch 'jk/reduce-gc-aggressive-depth'
2016-09-21  Junio C HamanoMerge branch 'mr/vcs-svn-printf-ulong'
2016-09-21  Junio C HamanoMerge branch 'rs/strbuf-remove-fix'
2016-09-21  Junio C HamanoMerge branch 'rs/checkout-some-states-are-const'
2016-09-21  Junio C HamanoMerge branch 'jk/setup-sequence-update'
2016-09-21  Junio C HamanoMerge branch 'ew/http-do-not-forget-to-call-curl-multi...
2016-09-21  Junio C HamanoMerge branch 'bw/pathspec-remove-unused-extern-decl'
2016-09-19  Junio C HamanoMerge branch 'po/range-doc' into maint
2016-09-19  Junio C HamanoMerge branch 'mh/ref-store'
2016-09-15  Junio C HamanoMerge branch 'jk/fix-remote-curl-url-wo-proto'
2016-09-11  Junio C HamanoMerge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09  Junio C HamanoMerge branch 'hv/doc-commit-reference-style'
2016-09-09  Junio C HamanoMerge branch 'po/range-doc'
2016-09-09  Junio C HamanoMerge branch 'hv/doc-commit-reference-style' into maint
2016-09-09  Junio C HamanoMerge branch 'rs/mailinfo-lib' into maint
2016-09-09  Junio C HamanoMerge branch 'jk/tighten-alloc' into maint
2016-09-09  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-09  Junio C HamanoMerge branch 'dg/document-git-c-in-git-config-doc'...
2016-09-09  Junio C HamanoMerge branch 'js/no-html-bypass-on-windows' into maint
2016-09-09  Junio C HamanoMerge branch 'js/import-tars-hardlinks' into maint
2016-09-09  Junio C HamanoMerge branch 'jk/push-force-with-lease-creation' into...
2016-09-09  Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf...
2016-09-07  Junio C HamanoMerge branch 'sy/i18n' of git-gui
2016-08-31  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix'
2016-08-31  Junio C HamanoMerge branch 'mh/blame-worktree'
2016-08-26  Junio C HamanoMerge branch 'js/no-html-bypass-on-windows' into rt...
2016-08-25  Junio C HamanoMerge branch 'dg/document-git-c-in-git-config-doc'
2016-08-25  Junio C HamanoMerge branch 'js/no-html-bypass-on-windows'
2016-08-25  Junio C HamanoMerge branch 'hv/doc-commit-reference-style'
2016-08-19  Junio C HamanoMerge branch 'ab/hooks'
2016-08-19  Junio C HamanoMerge branch 'tb/t0027-raciness-fix'
2016-08-17  Junio C HamanoMerge branch 'rs/mailinfo-lib'
2016-08-17  Junio C HamanoMerge branch 'jk/tighten-alloc'
2016-08-16  Junio C HamanoMerge branch 'lt/gpg-show-long-key-in-signature-verific...
2016-08-12  Junio C HamanoMerge branch 'js/import-tars-hardlinks'
2016-08-12  Junio C HamanoMerge branch 'jk/reset-ident-time-per-commit' into...
2016-08-10  Junio C HamanoMerge branch 'js/commit-slab-decl-fix'
2016-08-10  Junio C HamanoMerge branch 'jk/push-force-with-lease-creation'
2016-08-10  Junio C HamanoMerge branch 'jk/reset-ident-time-per-commit'
2016-08-10  Junio C HamanoMerge branch 'cp/completion-clone-recurse-submodules...
2016-08-10  Junio C HamanoMerge branch 'jc/hashmap-doc-init' into maint
2016-08-10  Junio C HamanoMerge branch 'ab/gitweb-link-html-escape' into maint
2016-08-10  Junio C HamanoMerge branch 'js/t4130-rename-without-ino' into maint
2016-08-10  Junio C HamanoMerge branch 'jc/grep-commandline-vs-configuration...
2016-08-10  Junio C HamanoMerge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning...
2016-08-10  Junio C HamanoMerge branch 'pm/build-persistent-https-with-recent...
2016-08-10  Junio C HamanoMerge branch 'os/no-verify-skips-commit-msg-too' into...
2016-08-10  Junio C HamanoMerge branch 'rs/rm-strbuf-optim' into maint
2016-08-10  Junio C HamanoMerge branch 'jk/parse-options-concat' into maint
2016-08-10  Junio C HamanoMerge branch 'ls/travis-enable-httpd-tests' into maint
2016-08-10  Junio C HamanoMerge branch 'ew/autoconf-pthread' into maint
2016-08-10  Junio C HamanoMerge branch 'mm/status-suggest-merge-abort' into maint
2016-08-08  Junio C HamanoMerge branch 'jc/hashmap-doc-init'
2016-08-08  Junio C HamanoMerge branch 'jk/parseopt-string-list'
2016-08-08  Junio C HamanoMerge branch 'nd/log-decorate-color-head-arrow'
2016-08-08  Junio C HamanoMerge branch 'ab/gitweb-link-html-escape'
2016-08-08  Junio C HamanoMerge branch 'cp/completion-clone-recurse-submodules'
2016-08-08  Junio C HamanoMerge branch 'ew/git-svn-http-tests'
2016-08-08  Junio C HamanoMerge branch 'js/t4130-rename-without-ino'
2016-08-08  Junio C HamanoMerge branch 'sb/pack-protocol-doc-nak' into maint
2016-08-08  Junio C HamanoMerge branch 'rs/submodule-config-code-cleanup' into...
2016-08-08  Junio C HamanoMerge branch 'sb/submodule-deinit-all' into maint
2016-08-08  Junio C HamanoMerge branch 'jc/doc-diff-filter-exclude' into maint
next