Merge branch 'md/list-objects-filter-parse-msgfix'
[gitweb.git] / Documentation / git-mergetool.txt
2019-06-21 Merge branch 'md/list-objects-filter-parse-msgfix'
2019-06-21 Merge branch 'md/list-objects-filter-memfix'
2019-06-21 Merge branch 'jt/partial-clone-missing-ref-delta-base'
2019-06-21 Merge branch 'ml/userdiff-rust'
2019-06-17 Merge branch 'pb/request-pull-verify-remote-ref'
2019-06-17 Merge branch 'mm/p4-unshelve-windows-fix'
2019-06-17 Merge branch 'po/git-help-on-git-itself'
2019-06-17 Merge branch 'es/first-contrib-tutorial'
2019-06-17 Merge branch 'bb/unicode-12.1-reiwa'
2019-06-17 Merge branch 'sw/git-p4-unshelve-branched-files'
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 Merge branch 'dl/rev-tilde-doc-clarify'
2019-05-13 mergetool: fallback to tool when guitool unavailable
2019-05-08 Merge branch 'ss/msvc-path-utils-fix'
2019-04-16 Merge branch 'js/remote-curl-i18n'
2019-04-16 Merge branch 'js/anonymize-remote-curl-diag'
2019-04-09 Merge branch 'jh/resize-convert-scratch-buffer'
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 'nd/split-index-null-base-fix'
2019-03-07 Merge branch 'rj/prune-packed-excess-args'
2019-03-07 Merge branch 'du/branch-show-current'
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-09 Merge branch 'tz/gpg-test-fix'
2019-02-07 Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
2019-02-07 Merge branch 'ma/doc-diff-usage-fix'
2019-02-07 Merge branch 'ab/diff-tree-doc-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 'sg/object-as-type-commit-graph-fix'
2019-02-05 Merge branch 'bp/checkout-new-branch-optim'
2019-02-05 Merge branch 'jk/attr-macro-fix'
2019-02-05 Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
2019-02-05 Merge branch 'cc/test-ref-store-typofix'
2019-02-05 Merge branch 'sg/obstack-cast-function-type-fix'
2019-02-05 Merge branch 'jt/get-reference-with-commit-graph'
2019-02-05 Merge branch 'sb/more-repo-in-api'
2019-01-29 Merge branch 'js/add-e-clear-patch-before-stating'
2019-01-29 Merge branch 'jk/remote-insteadof-cleanup'
next