]> git.ipfire.org Git - thirdparty/git.git/history - git-mergetool--lib.sh
Merge branch 'jc/add-i-use-builtin-experimental'
[thirdparty/git.git] / git-mergetool--lib.sh
2020-09-19  Junio C HamanoMerge branch 'al/t3200-back-on-a-branch'
2020-09-19  Junio C HamanoMerge branch 'ea/blame-use-oideq'
2020-09-09  Junio C HamanoMerge branch 'jt/interpret-branch-name-fallback'
2020-09-09  Junio C HamanoMerge branch 'hv/ref-filter-misc'
2020-09-09  Junio C HamanoMerge branch 'ss/submodule-summary-in-c-fixes'
2020-09-09  Junio C HamanoMerge branch 'jk/worktree-check-clean-leakfix'
2020-09-09  Junio C HamanoMerge branch 'tb/repack-clearing-midx'
2020-09-09  Junio C HamanoMerge branch 'ss/submodule-summary-in-c'
2020-09-03  Junio C HamanoMerge branch 'pb/doc-external-diff-env'
2020-09-03  Junio C HamanoMerge branch 'jk/xrealloc-avoid-use-after-free'
2020-09-03  Junio C HamanoMerge branch 'jc/post-checkout-doc'
2020-09-03  Junio C HamanoMerge branch 'so/pretty-abbrev-doc'
2020-09-03  Junio C HamanoMerge branch 'mr/diff-hide-stat-wo-textual-change'
2020-09-03  Junio C HamanoMerge branch 'jc/run-command-use-embedded-args'
2020-09-03  Junio C HamanoMerge branch 'jk/slimmed-down'
2020-09-03  Junio C HamanoMerge branch 'pw/add-p-allowed-options-fix'
2020-09-03  Junio C HamanoMerge branch 'jt/fetch-pack-loosen-validation-with...
2020-09-03  Junio C HamanoMerge branch 'ss/t7401-modernize'
2020-09-03  Junio C HamanoMerge branch 'pw/rebase-i-more-options'
2020-08-31  Junio C HamanoMerge branch 'ps/ref-transaction-hook'
2020-08-31  Junio C HamanoMerge branch 'jk/rev-input-given-fix'
2020-08-31  Junio C HamanoMerge branch 'rp/apply-cached-doc'
2020-08-31  Junio C HamanoMerge branch 'rs/checkout-no-overlay-pathspec-fix'
2020-08-31  Junio C HamanoMerge branch 'al/bisect-first-parent'
2020-08-31  Junio C HamanoMerge branch 'jk/refspecs-cleanup'
2020-08-31  Junio C HamanoMerge branch 'hn/refs-pseudorefs'
2020-08-31  Junio C HamanoMerge branch 'jk/index-pack-w-more-threads'
2020-08-31  Junio C HamanoMerge branch 'hv/ref-filter-trailers-atom-parsing-fix'
2020-08-31  Junio C HamanoMerge branch 'dd/diff-customize-index-line-abbrev'
2020-08-31  Junio C HamanoMerge branch 'am/ci-wsfix'
2020-08-27  Junio C HamanoMerge branch 'hn/refs-fetch-head-is-special'
2020-08-27  Junio C HamanoMerge branch 'jk/leakfix'
2020-08-24  Junio C HamanoMerge branch 'rs/patch-id-with-incomplete-line'
2020-08-24  Junio C HamanoMerge branch 'dl/subtree-docs'
2020-08-24  Junio C HamanoMerge branch 'mt/checkout-entry-dead-code-removal'
2020-08-24  Junio C HamanoMerge branch 'ma/doc-sha-256-is-experimental'
2020-08-24  Junio C HamanoMerge branch 'rs/more-buffered-io'
2020-08-24  Junio C HamanoMerge branch 'jk/unleak-fixes'
2020-08-24  Junio C HamanoMerge branch 'en/dir-nonbare-embedded'
2020-08-24  Junio C HamanoMerge branch 'ds/midx-repack-to-batch-size'
2020-08-24  Junio C HamanoMerge branch 'es/init-no-separate-git-dir-in-bare'
2020-08-19  Junio C HamanoMerge branch 'jh/mingw-unlink'
2020-08-19  Junio C HamanoMerge branch 'ds/sha256-leftover-bits'
2020-08-19  Junio C HamanoMerge branch 'ma/sha-256-docs'
2020-08-19  Junio C HamanoMerge branch 'jc/object-names-are-not-sha-1'
2020-08-19  Junio C HamanoMerge branch 'bc/sha-256-doc-updates'
2020-08-19  Junio C HamanoMerge branch 'pb/set-url-docfix'
2020-08-19  Junio C HamanoMerge branch 'pb/userdiff-fortran-update'
2020-08-19  Junio C HamanoMerge branch 'jb/commit-graph-doc-fix'
2020-08-19  Junio C HamanoMerge branch 'jk/blame-coalesce-fix'
2020-08-19  Junio C HamanoMerge branch 'ak/sequencer-fix-find-uniq-abbrev'
2020-08-19  Junio C HamanoMerge branch 'en/sequencer-merge-labels'
2020-08-19  Junio C HamanoMerge branch 'rs/preserve-merges-unused-code-removal'
2020-08-19  Junio C HamanoMerge branch 'rs/upload-pack-sigchain-fix'
2020-08-19  Junio C HamanoMerge branch 'rp/ita-diff-modefix'
2020-08-19  Junio C HamanoMerge branch 'en/merge-tests'
2020-08-18  Junio C HamanoMerge branch 'so/log-diff-merges-opt'
2020-08-18  Junio C HamanoMerge branch 'jk/log-fp-implies-m'
2020-08-18  Junio C HamanoMerge branch 'ma/stop-progress-null-fix'
2020-08-18  Junio C HamanoMerge branch 'es/test-cmp-typocatcher'
2020-08-18  Junio C HamanoMerge branch 'rp/apply-cached-with-i-t-a'
2020-08-18  Junio C HamanoMerge branch 'al/bisect-first-parent'
2020-08-18  Junio C HamanoMerge branch 'jk/sideband-error-l10n'
2020-08-18  Junio C HamanoMerge branch 'jc/noop-with-static-inline'
2020-08-18  Junio C HamanoMerge branch 'pd/mergetool-nvimdiff'
2020-07-31  Junio C HamanoMerge branch 'jb/doc-packfile-name' into master
2020-07-29  pudinhamergetools: add support for nvimdiff (neovim) family
2020-07-29  pudinhamergetool--lib: improve support for vimdiff-style tool...
2020-07-20  Junio C HamanoMerge https://github.com/prati0100/git-gui into master
2020-06-09  Junio C HamanoMerge branch 'cb/bisect-helper-parser-fix'
2020-06-09  Junio C HamanoMerge branch 'vs/complete-stash-show-p-fix'
2020-05-25  Junio C HamanoMerge branch 'ds/multi-pack-verify'
2020-05-21  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-05-14  Junio C HamanoMerge branch 'js/rebase-autosquash-double-fixup-fix'
2020-05-08  Junio C HamanoMerge branch 'cb/t0000-use-the-configured-shell'
2020-05-08  Junio C HamanoMerge branch 'jk/for-each-ref-multi-key-sort-fix'
2020-05-08  Junio C HamanoMerge branch 'cb/credential-store-ignore-bogus-lines'
2020-05-05  Junio C HamanoMerge branch 'js/partial-urlmatch-2.17'
2020-05-01  Junio C HamanoMerge branch 'ds/multi-pack-index'
2020-04-29  Junio C HamanoSync with js/partial-urlmatch-2.17
2020-04-28  Junio C HamanoMerge branch 'ds/commit-graph-expiry-fix'
2020-04-22  Junio C HamanoMerge branch 'jc/missing-ref-store-fix'
2020-04-22  Junio C HamanoMerge branch 'js/t0007-typofix'
2020-04-22  Junio C HamanoMerge branch 'dl/wrapper-fix-indentation'
2020-04-19  Jonathan NiederGit 2.22.4 v2.22.4
2020-04-19  Jonathan NiederGit 2.20.4 v2.20.4
2020-03-25  Junio C HamanoMerge branch 'en/oidset-uninclude-hashmap'
2020-03-25  Junio C HamanoMerge branch 'sg/commit-slab-clarify-peek'
2020-03-19  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-03-17  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help' into maint
2020-03-17  Junio C HamanoGit 2.22.3 v2.22.3
2020-03-17  Junio C HamanoGit 2.20.3 v2.20.3
2020-03-11  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help'
2020-03-05  Junio C HamanoMerge branch 'rs/commit-graph-code-simplification'
2020-02-14  Junio C HamanoMerge branch 'bc/actualmente' into maint
2020-02-14  Junio C HamanoMerge branch 'nd/switch-and-restore' into maint
2020-01-30  Junio C HamanoMerge branch 'bc/actualmente'
2020-01-22  Junio C HamanoMerge branch 'nd/switch-and-restore'
2020-01-08  Junio C HamanoMerge branch 'tm/doc-submodule-absorb-fix'
2020-01-08  Junio C HamanoMerge branch 'jb/doc-multi-pack-idx-fix'
next