Merge branch 'sg/git-test-boolean'
[gitweb.git] / Documentation / git-mergetool--lib.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 mergetool: use get_merge_tool function
2019-03-18 Merge git://ozlabs.org/~paulus/gitk
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-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui
2017-12-05 Merge branch 'ls/no-double-utf8-author-name' of .....
2017-11-22 Merge branch 'jn/reproducible-build' of ../git-gui...
2017-11-09 Merge branch 'tz/fsf-address-update' of ../git-gui...
2017-10-28 Merge branch 'sg/rev-list-doc-reorder-fix'
2017-07-25 Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-04-17 Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-01-18 Merge git://ozlabs.org/~paulus/gitk
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-26 Merge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26 Merge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-13 Merge branch 'js/t3404-grammo-fix'
2016-07-11 Merge branch 'cb/t7810-test-label-fix' into maint
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-05-26 Merge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18 Merge branch 'rn/glossary-typofix' into HEAD
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-05-10 Merge branch 'rn/glossary-typofix'
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-02-22 Merge branch 'jk/config-include'
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-02 Merge branch 'ee/clean-test-fixes'
2015-09-01 Merge branch 'ah/reflog-typofix-in-error'
next