mergetools: simplify how we handle "vim" and "defaults"
[git] / git-difftool.perl
2013-01-25  John Keepinggit-difftool: use git-mergetool--lib for "--tool-help"
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-17  Junio C HamanoSync with 1.7.12.4
2012-10-17  Junio C HamanoMerge branch 'jk/maint-http-half-auth-push' into maint
2012-10-17  Junio C HamanoMerge branch 'jc/doc-long-options' into maint
2012-10-17  Junio C HamanoMerge branch 'jc/maint-t1450-fsck-order-fix' into maint
2012-10-17  Junio C HamanoMerge branch 'jc/ll-merge-binary-ours' into maint
2012-10-16  Junio C HamanoMerge branch 'jk/maint-http-half-auth-push'
2012-10-14  Junio C HamanoMerge branch 'maint'
2012-10-12  Junio C HamanoMerge branch 'maint'
2012-10-10  Junio C HamanoMerge branch 'rr/git-uri-doc'
2012-10-10  Junio C HamanoMerge branch 'bw/cp-a-is-gnuism'
2012-10-10  Junio C HamanoMerge branch 'nd/doc-ignore'
2012-10-10  Junio C HamanoMerge branch 'jc/doc-long-options'
2012-10-10  Junio C HamanoSync with maint
2012-10-09  Junio C HamanoMerge branch 'maint'
2012-10-08  Junio C HamanoMerge branch 'jc/maint-t1450-fsck-order-fix'
2012-10-08  Junio C HamanoMerge branch 'jc/merge-bases-paint-fix'
2012-10-08  Junio C HamanoSync with 1.7.12.3
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-08  Junio C HamanoMerge branch 'rt/maint-clone-single' into maint
2012-10-08  Junio C HamanoMerge branch 'jc/blame-follows-renames' into maint
2012-10-08  Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely...
2012-10-03  Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely'
2012-10-02  Junio C HamanoMerge branch 'maint'
2012-10-02  Junio C HamanoMerge branch 'rr/maint-submodule-unknown-cmd' into...
2012-10-01  Junio C HamanoMerge branch 'jk/completion-tests'
2012-10-01  Junio C HamanoMerge branch 'da/mergetool-custom'
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore'
2012-10-01  Junio C HamanoMerge branch 'jc/blame-follows-renames'
2012-10-01  Junio C HamanoMerge branch 'jk/receive-pack-unpack-error-to-pusher'
2012-10-01  Junio C HamanoMerge branch 'rt/maint-clone-single'
2012-09-30  Junio C HamanoSync with 1.7.12.2
2012-09-30  Junio C HamanoMerge branch 'jc/maint-log-grep-all-match-1' into maint
2012-09-30  Junio C HamanoMerge branch 'jc/maint-mailinfo-mime-attr' into maint
2012-09-30  Junio C HamanoMerge branch 'rr/maint-submodule-unknown-cmd'
2012-09-30  Junio C HamanoMerge branch 'rs/archive-zip-utf8'
2012-09-30  Junio C HamanoMerge branch 'jk/smart-http-switch'
2012-09-30  Junio C HamanoMerge branch 'sp/maint-http-enable-gzip'
2012-09-30  Junio C HamanoMerge branch 'sp/maint-http-info-refs-no-retry'
2012-09-30  Junio C HamanoMerge branch 'js/rebase-exec-command-not-found'
2012-09-30  Junio C HamanoMerge branch 'rr/test-use-shell-path-not-shell'
2012-09-27  Jiang XinMerge branch 'maint'
2012-09-25  Junio C HamanoMerge branch 'rr/test-make-sure-we-have-git'
2012-09-25  Junio C HamanoMerge branch 'aj/xfuncname-ada'
2012-09-25  Junio C HamanoMerge branch 'jc/maint-mailinfo-mime-attr'
2012-09-25  Junio C HamanoMerge branch 'po/maint-docs'
2012-09-25  Junio C HamanoMerge branch 'db/doc-custom-xmlto'
2012-09-25  Junio C HamanoMerge branch 'maint'
2012-09-24  Junio C HamanoSync with maint
2012-09-24  Junio C HamanoMerge branch 'jc/maint-blame-no-such-path' into maint
2012-09-24  Junio C HamanoMerge branch 'dj/fetch-all-tags' into maint
2012-09-21  Junio C HamanoMerge branch 'jc/maint-log-grep-all-match-1'
2012-09-20  Junio C HamanoMerge branch 'maint'
2012-09-20  Junio C HamanoMerge branch 'dg/run-command-child-cleanup' into maint
2012-09-20  Junio C HamanoMerge branch 'sn/ls-remote-get-url-doc' into maint
2012-09-20  Junio C HamanoMerge branch 'nd/log-n-doc' into maint
2012-09-18  Junio C HamanoMerge branch 'jc/maint-log-grep-all-match'
2012-09-18  Junio C HamanoMerge branch 'pw/p4-submit-conflicts'
2012-09-18  Junio C HamanoMerge branch 'nd/fetch-status-alignment'
2012-09-18  Junio C HamanoSync with 1.7.12.1
2012-09-18  Junio C HamanoMerge branch 'er/doc-fast-import-done' into maint
2012-09-17  Junio C HamanoMerge branch 'maint'
2012-09-17  Junio C HamanoMerge branch 'nd/maint-diffstat-summary'
2012-09-17  Junio C HamanoMerge branch 'jk/config-warn-on-inaccessible-paths'
2012-09-17  Junio C HamanoMerge branch 'jw/doc-commit-title'
2012-09-17  Junio C HamanoMerge branch 'jc/maint-blame-no-such-path'
2012-09-15  Junio C HamanoMerge branch 'jc/ll-merge-binary-ours'
2012-09-15  Junio C HamanoMerge branch 'cn/branch-set-upstream-to'
2012-09-15  Junio C HamanoMerge branch 'dg/run-command-child-cleanup'
2012-09-15  Junio C HamanoMerge branch 'jc/mailinfo-RE'
2012-09-15  Junio C HamanoMerge branch 'maint'
2012-09-15  Junio C HamanoMerge branch 'sb/send-email-reconfirm-fix' into maint
2012-09-15  Junio C HamanoMerge branch 'jc/send-email-reconfirm' into maint
2012-09-15  Junio C HamanoMerge branch 'mz/cherry-pick-cmdline-order' into maint
2012-09-15  Junio C HamanoSync with 1.7.11.7
2012-09-15  Junio C HamanoMerge branch 'rj/test-regex' into maint-1.7.11
2012-09-15  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-15  Junio C HamanoMerge branch 'jc/maint-checkout-fileglob-doc' into...
2012-09-14  Junio C HamanoMerge branch 'mh/abspath'
2012-09-14  Junio C HamanoMerge branch 'dj/fetch-all-tags'
2012-09-14  Junio C HamanoMerge branch 'sn/ls-remote-get-url-doc'
2012-09-14  Junio C HamanoMerge branch 'nd/i18n-status'
2012-09-14  Junio C HamanoMerge branch 'rj/path-cleanup'
2012-09-14  Junio C HamanoMerge branch 'rj/tap-fix'
2012-09-12  Junio C HamanoMerge branch 'maint'
2012-09-12  Junio C HamanoMerge branch 'jc/maint-checkout-fileglob-doc'
2012-09-12  Junio C HamanoMerge branch 'sb/send-email-reconfirm-fix'
2012-09-12  Junio C HamanoMerge branch 'nd/maint-remote-remove'
2012-09-12  Junio C HamanoMerge branch 'nd/log-n-doc'
2012-09-12  Junio C HamanoMerge branch 'js/compat-itimer'
2012-09-12  Junio C HamanoMerge branch 'js/compat-mkdir'
2012-09-12  Junio C HamanoMerge branch 'maint-1.7.11' into maint
2012-09-12  Junio C HamanoMerge branch 'jc/apply-binary-p0' into maint-1.7.11
2012-09-12  Junio C HamanoMerge branch 'jc/maint-doc-checkout-b-always-takes...
2012-09-12  Junio C HamanoMerge branch 'jk/maint-http-half-auth-push' into maint...
2012-09-12  Junio C HamanoMerge branch 'kk/maint-for-each-ref-multi-sort' into...
2012-09-12  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2012-09-12  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents'
2012-09-11  Junio C HamanoMerge branch 'rj/test-regex'
next