Merge branch 'sg/git-test-boolean'
[gitweb.git] / Documentation / git-difftool.txt
2019-06-17 Merge branch 'bl/userdiff-octave'
2019-06-17 Merge branch 'ba/clone-remote-submodules'
2019-06-17 Merge branch 'vv/merge-squash-with-explicit-commit'
2019-06-17 Merge branch 'js/bundle-verify-require-object-store'
2019-06-17 Merge branch 'js/bisect-helper-check-get-oid-return...
2019-06-17 Merge branch 'jk/am-i-resolved-fix'
2019-06-17 Merge branch 'jk/HEAD-symref-in-xfer-namespaces'
2019-06-17 Merge branch 'es/grep-require-name-when-needed'
2019-06-17 Merge branch 'es/git-debugger-doc'
2019-06-17 Merge branch 'ds/object-info-for-prefetch-fix'
2019-06-13 Merge branch 'pw/rebase-edit-message-for-replayed-merge'
2019-06-13 Merge branch 'ab/deprecate-R-for-dynpath'
2019-06-13 Merge branch 'mh/import-transport-fd-fix'
2019-06-13 Merge branch 'ew/update-server-info'
2019-06-13 Merge branch 'jk/help-unknown-ref-fix'
2019-06-13 Merge branch 'dl/format-patch-notes-config'
2019-06-13 Merge branch 'nd/merge-quit'
2019-06-13 Merge branch 'ab/fail-prereqs-in-test'
2019-06-13 Merge branch 'nd/corrupt-worktrees'
2019-06-13 Merge branch 'js/rebase-cleanup'
2019-06-13 Merge branch 'nd/worktree-name-sanitization'
2019-06-13 Merge branch 'en/fast-export-encoding'
2019-06-13 Merge branch 'jk/unused-params-final-batch'
2019-06-13 Merge branch 'sb/format-patch-base-patch-id-fix'
2019-06-13 Merge branch 'nd/init-relative-template-fix'
2019-06-13 Merge branch 'ab/send-email-transferencoding-fix'
2019-06-06 Merge branch 'en/merge-directory-renames-fix'
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/fsmonitor-refresh-after-discarding...
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 '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 difftool: fallback on merge.guitool
2019-03-18 Merge git://ozlabs.org/~paulus/gitk
2018-11-21 Merge branch 'jk/check-everything-connected-is-long...
2018-10-16 Merge branch 'jk/check-everything-connected-is-long...
2018-08-27 Merge branch 'sg/t7501-thinkofix'
2018-08-27 Merge branch 'sg/t0020-conversion-fix'
2018-08-27 Merge branch 'sg/t4051-fix'
2018-08-20 Merge branch 'js/typofixes'
2018-08-15 Merge branch 'sb/histogram-less-memory'
2018-07-24 Merge branch 'jk/fetch-all-peeled-fix'
2018-06-28 Merge branch 'jk/fetch-all-peeled-fix'
2018-05-30 Merge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-08 Merge branch 'ab/git-svn-get-record-typofix'
2018-04-25 Merge branch 'js/t5404-path-fix'
2018-04-25 Merge branch 'mn/send-email-credential-doc'
2018-04-25 Merge branch 'ak/bisect-doc-typofix'
2018-03-22 Merge branch 'sb/status-doc-fix' into maint
2018-03-22 Merge branch 'bc/doc-interpret-trailers-grammofix'...
2018-03-22 Merge branch 'cl/t9001-cleanup' into maint
2018-03-22 Merge branch 'nd/diff-flush-before-warning' into maint
2018-03-21 Merge branch 'dp/merge-strategy-doc-fix'
2018-03-08 Merge branch 'mk/doc-pretty-fill'
2018-03-06 Merge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02 Merge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02 Merge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-02-28 Merge branch 'tz/do-not-clean-spec-file'
2018-02-28 Merge branch 'sb/status-doc-fix'
2018-02-27 Merge branch 'bc/doc-interpret-trailers-grammofix'
2018-02-27 Merge branch 'bp/name-hash-dirname-fix'
2018-02-15 Merge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-13 Merge branch 'nd/diff-flush-before-warning'
2018-02-13 Merge branch 'cl/t9001-cleanup'
2018-01-23 Merge branch 'as/read-tree-prefix-doc-fix'
2018-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui
2018-01-05 Merge branch 'jh/memihash-opt'
2017-12-28 Merge branch 'sr/http-sslverify-config-doc'
2017-12-27 Merge branch 'es/clone-shared-worktree'
2017-12-27 Merge branch 'jk/cvsimport-quoting'
2017-12-27 Merge branch 'rs/am-builtin-leakfix'
2017-12-05 Merge branch 'ls/no-double-utf8-author-name' of .....
2017-11-27 Merge branch 'rs/apply-fuzzy-match-fix' into maint
2017-11-22 Merge branch 'jn/reproducible-build' of ../git-gui...
2017-11-21 Merge branch 'rs/apply-fuzzy-match-fix'
next