Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
[gitweb.git] / t / t7610-mergetool.sh
2019-05-31 Merge branch 'master' of git://git./git/git
2019-05-30 Merge branch 'js/rebase-config-bitfix'
2019-05-30 Merge branch 'es/doc-gitsubmodules-markup'
2019-05-30 Merge branch 'ja/diff-opt-typofix'
2019-05-30 Merge branch 'jt/clone-server-option'
2019-05-30 Merge branch 'sg/progress-off-by-one-fix'
2019-05-30 Merge branch 'js/rebase-deprecate-preserve-merges'
2019-05-30 Merge branch 'jh/trace2'
2019-05-30 Merge branch 'nd/diff-parseopt'
2019-05-19 Merge branch 'js/difftool-no-index'
2019-05-19 Merge branch 'jk/get-oid-indexed-object-name'
2019-05-19 Merge branch 'jc/set-packet-header-signature-fix'
2019-05-19 Merge branch 'cb/http-push-null-in-message-fix'
2019-05-19 Merge branch 'js/stash-in-c-use-builtin-doc'
2019-05-19 Merge branch 'tz/test-lib-check-working-jgit'
2019-05-19 Merge branch 'js/parseopt-unknown-cb-returns-an-enum'
2019-05-19 Merge branch 'ab/sha1dc'
2019-05-19 Merge branch 'js/rebase-i-label-shown-in-status-fix'
2019-05-19 Merge branch 'es/check-non-portable-pre-5.10'
2019-05-19 Merge branch 'ds/trace2-document-env-vars'
2019-05-19 Merge branch 'js/fsmonitor-refresh-after-discarding...
2019-05-19 Merge branch 'cm/notes-comment-fix'
2019-05-19 Merge branch 'tt/no-ipv6-fallback-for-winxp'
2019-05-19 Merge branch 'js/t5580-unc-alternate-test'
2019-05-19 Merge branch 'ds/cvsexportcommit-force-text'
2019-05-19 Merge branch 'sg/ci-libsvn-perl'
2019-05-19 Merge branch 'bl/t4253-exit-code-from-format-patch'
2019-05-19 Merge branch 'ds/midx-too-many-packs'
2019-05-19 Merge branch 'en/unicode-in-refnames'
2019-05-19 Merge branch 'dl/difftool-mergetool'
2019-05-13 Merge branch 'dl/rev-tilde-doc-clarify'
2019-05-13 mergetool: fallback to tool when guitool unavailable
2019-04-25 t7610: add mergetool --gui tests
2019-04-25 t7610: unsuppress output
2019-04-09 Merge branch 'ja/dir-rename-doc-markup-fix'
2019-03-20 Merge branch 'jk/virtual-objects-do-exist'
2019-03-18 Merge git://ozlabs.org/~paulus/gitk
2019-03-11 Merge branch 'js/rebase-recreate-merge'
2019-03-07 Merge branch 'ab/receive-pack-use-after-free-fix'
2019-03-07 Merge branch 'rj/prune-packed-excess-args'
2019-02-14 Merge branch 'jc/no-grepping-for-strerror-in-tests'
2019-02-14 Merge branch 'kd/t0028-octal-del-is-377-not-777'
2019-02-14 Merge branch 'rj/sequencer-sign-off-header-static'
2019-02-07 Merge branch 'ma/doc-diff-usage-fix'
2019-02-07 Merge branch 'ss/describe-dirty-in-the-right-directory'
2019-02-07 Merge branch 'lt/date-human'
2019-02-05 Merge branch 'bp/checkout-new-branch-optim'
2019-02-05 Merge branch 'cc/test-ref-store-typofix'
2019-02-05 Merge branch 'sg/obstack-cast-function-type-fix'
2019-01-29 Merge branch 'js/add-e-clear-patch-before-stating'
2019-01-29 Merge branch 'cc/fetch-error-message-fix'
2019-01-29 Merge branch 'cc/partial-clone-doc-typofix'
2019-01-18 Merge branch 'jk/dev-build-format-security'
2019-01-14 Merge branch 'md/exclude-promisor-objects-fix-cleanup'
2019-01-14 Merge branch 'hn/highlight-sideband-keywords'
2019-01-14 Merge branch 'hb/t0061-dot-in-path-fix'
2019-01-03 Merge branch 'sg/test-bash-version-fix'
2018-12-15 Merge branch 'jc/run-command-report-exec-failure-fix...
2018-12-15 Merge branch 'nd/show-gitcomp-compilation-fix' into...
2018-12-15 Merge branch 'js/mailinfo-format-flowed-fix' into maint
2018-12-13 Merge branch 'master' of github.com:linusboyle/git
2018-12-04 Merge branch 'en/rebase-consistency'
2018-12-01 Merge branch 'rt/rebase-in-c-message-fix'
2018-12-01 Merge branch 'sg/daemon-test-signal-fix'
2018-11-29 Merge branch 'nd/n18n-fix'
2018-11-26 Merge branch 'tb/clone-case-smashing-warning-test'
2018-11-26 Merge branch 'jk/t5562-perl-path-fix'
2018-11-21 Merge branch 'sg/test-rebase-editor-fix' into maint
2018-11-21 Merge branch 'tb/char-may-be-unsigned' into maint
2018-11-21 Merge branch 'jk/uploadpack-packobjectshook-fix' into...
2018-11-21 Merge branch 'sg/doc-show-branch-typofix' into maint
2018-11-21 Merge branch 'mm/doc-no-dashed-git' into maint
2018-11-21 Merge branch 'ma/t7005-bash-workaround' into maint
2018-11-21 Merge branch 'ma/mailing-list-address-in-git-help'...
2018-11-21 Merge branch 'nd/packobjectshook-doc-fix' into maint
2018-11-21 Merge branch 'jk/check-everything-connected-is-long...
2018-11-21 Merge branch 'fe/doc-updates' into maint
2018-11-21 Merge branch 'tq/refs-internal-comment-fix' into maint
2018-11-21 Merge branch 'bw/protocol-v2' into maint
2018-11-21 Merge branch 'sb/string-list-remove-unused' into maint
2018-11-21 Merge branch 'jk/dev-build-format-security' into maint
2018-11-21 Merge branch 'sg/t3701-tighten-trace' into maint
2018-11-21 Merge branch 'en/double-semicolon-fix' into maint
2018-11-21 Merge branch 'sg/doc-trace-appends' into maint
2018-11-21 Merge branch 'tg/conflict-marker-size' into maint
2018-11-21 Merge branch 'ts/doc-build-manpage-xsl-quietly' into...
2018-11-21 Merge branch 'md/exclude-promisor-objects-fix' into...
2018-11-21 Merge branch 'jc/receive-deny-current-branch-fix' into...
2018-11-21 Merge branch 'js/diff-notice-has-drive-prefix' into...
2018-11-21 Merge branch 'jk/run-command-notdot' into maint
2018-11-21 Merge branch 'np/log-graph-octopus-fix' into maint
2018-11-21 Merge branch 'sm/show-superproject-while-conflicted...
2018-11-21 Merge branch 'jn/mailmap-update' into maint
2018-11-21 Merge branch 'ds/commit-graph-with-grafts' into maint
2018-11-21 Merge branch 'tg/range-diff-corner-case-fix' into maint
2018-11-21 Merge branch 'en/sequencer-empty-edit-result-aborts...
2018-11-21 Merge branch 'nd/attr-pathspec-fix' into maint
2018-11-21 Merge branch 'en/rerere-multi-stage-1-fix' into maint
2018-11-21 Merge branch 'js/mingw-o-append' into maint
2018-11-21 Merge branch 'jk/reopen-tempfile-truncate' into maint
next