mergetool: run prompt only if guessed tool
[gitweb.git] / userdiff.c
2014-04-21 Merge branch 'km/avoid-non-function-return-in-rebase'
2014-04-21 Merge branch 'ep/shell-command-substitution'
2014-04-18 Merge branch 'jk/config-die-bad-number-noreturn'
2014-04-18 Merge branch 'fc/remote-helper-fixes'
2014-04-16 Merge branch 'mh/multimail'
2014-04-16 Merge branch 'tb/unicode-6.3-zero-width'
2014-04-16 Merge branch 'km/avoid-cp-a'
2014-04-16 Merge branch 'km/avoid-bs-in-shell-glob'
2014-04-09 Sync with 1.9.2
2014-04-09 Merge branch 'cn/fetch-prune-overlapping-destination...
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge branch 'jc/fix-diff-no-index-diff-opt-parse'...
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'maint'
2014-04-08 Merge branch 'mm/status-porcelain-format-i18n-fix'...
2014-04-08 Merge branch 'jk/pack-bitmap'
2014-04-08 Merge branch 'jl/nor-or-nand-and'
2014-04-08 Merge branch 'mh/update-ref-batch-create-fix'
2014-04-08 Merge branch 'mr/opt-set-ptr'
2014-04-08 Merge branch 'ib/rev-parse-parseopt-argh'
2014-04-08 Merge branch 'mr/msvc-link-with-invalidcontinue'
2014-04-08 Merge branch 'jc/rev-parse-argh-dashed-multi-words'
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
2014-04-03 Merge branch 'maint'
2014-04-03 Merge branch 'jk/mv-submodules-fix' into maint
2014-04-03 Merge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03 Merge branch 'jk/lib-terminal-lazy' into maint
2014-04-03 Merge branch 'nd/index-pack-error-message' into maint
2014-04-03 Merge branch 'rr/doc-merge-strategies' into maint
2014-04-03 Merge branch 'jc/stash-pop-not-popped' into maint
2014-04-03 Merge branch 'nd/gc-aggressive'
2014-04-03 Merge branch 'jc/fix-diff-no-index-diff-opt-parse'
2014-04-03 Merge branch 'cb/aix'
2014-04-03 Merge branch 'cn/fetch-prune-overlapping-destination'
2014-04-03 Merge branch 'nd/log-show-linear-break'
2014-04-03 Merge branch 'ep/shell-command-substitution'
2014-04-02 Merge branch 'ap/remote-hg-skip-null-bookmarks'
2014-04-02 Merge branch 'rs/pickaxe-i'
2014-03-31 Merge branch 'mm/status-porcelain-format-i18n-fix'
2014-03-31 Merge branch 'an/branch-config-message'
2014-03-31 Merge branch 'jk/tests-cleanup'
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-2'
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-31 Merge branch 'mr/msvc-link-with-lcurl'
2014-03-31 Merge branch 'ib/rev-parse-parseopt-argh'
2014-03-31 Merge branch 'dp/makefile-charset-lib-doc'
2014-03-31 Merge branch 'js/userdiff-cc'
2014-03-31 Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'
2014-03-31 Merge branch 'ca/doc-config-third-party'
2014-03-31 Merge branch 'hs/simplify-bit-setting-in-fsck-tree'
2014-03-28 Merge branch 'jk/pack-bitmap'
2014-03-25 Merge branch 'rr/doc-merge-strategies'
2014-03-25 Merge branch 'nd/index-pack-error-message'
2014-03-25 Merge branch 'jk/lib-terminal-lazy'
2014-03-25 Merge branch 'dm/configure-iconv-locale-charset'
2014-03-25 Merge branch 'jk/warn-on-object-refname-ambiguity'
2014-03-25 Merge branch 'mh/remove-subtree-long-pathname-fix'
2014-03-25 Merge branch 'nd/indent-fix-connect-c'
2014-03-25 Merge branch 'jk/mv-submodules-fix'
2014-03-25 Merge branch 'cp/am-patch-format-doc'
2014-03-21 userdiff: have 'cpp' hunk header pattern catch more...
2014-03-21 userdiff: support unsigned and long long suffixes of...
2014-03-21 userdiff: support C++ ->* and .* operators in the word...
2014-03-21 Merge branch 'lt/request-pull'
2014-03-21 Merge branch 'es/sh-i18n-envsubst'
2014-03-21 Merge branch 'jc/stash-pop-not-popped'
2014-03-18 Merge branch 'jk/clean-d-pathspec' into maint
2014-03-18 Merge branch 'da/difftool-git-files' into maint
2014-03-18 Merge branch 'jk/remote-pushremote-config-reading'...
2014-03-18 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18 Merge branch 'tr/diff-submodule-no-reuse-worktree'...
2014-03-18 Merge branch 'nd/reset-setup-worktree' into maint
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Merge branch 'bk/refresh-missing-ok-in-merge-recursive...
2014-03-18 Merge branch 'ds/rev-parse-required-args' into maint
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-03-18 Merge branch 'nd/diff-quiet-stat-dirty' into maint
2014-03-18 Merge branch 'nd/http-fetch-shallow-fix' into maint
2014-03-18 Merge branch 'nd/submodule-pathspec-ending-with-slash...
2014-03-18 Merge branch 'jc/no-need-for-env-in-sh-scripts'
2014-03-18 Merge branch 'mh/simplify-cache-tree-find'
2014-03-18 Merge branch 'jn/branch-lift-unnecessary-name-length...
2014-03-18 Merge branch 'jk/repack-pack-keep-objects'
2014-03-18 Merge branch 'fc/transport-helper-fixes'
2014-03-18 Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-18 Merge branch 'jk/diff-filespec-cleanup'
2014-03-18 Merge branch 'jk/clean-d-pathspec'
2014-03-14 Merge branch 'sr/add--interactive-term-readkey'
2014-03-14 Merge branch 'sh/write-pack-file-warning-message-fix'
2014-03-14 Merge branch 'jn/bisect-coding-style'
2014-03-14 Merge branch 'rt/help-pretty-prints-cmd-names'
2014-03-14 Merge branch 'jl/doc-submodule-update-checkout'
2014-03-14 Merge branch 'jk/doc-coding-guideline'
2014-03-14 Merge branch 'da/difftool-git-files'
2014-03-14 Merge branch 'jm/stash-doc-k-for-keep'
2014-03-14 Merge branch 'jk/remote-pushremote-config-reading'
2014-03-14 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-14 Merge branch 'jh/note-trees-record-blobs'
2014-03-14 Merge branch 'tr/diff-submodule-no-reuse-worktree'
2014-03-14 Merge branch 'nd/reset-setup-worktree'
next