]> git.ipfire.org Git - thirdparty/git.git/history - mergetools
Merge branch 'maint-2.36' into maint-2.37
[thirdparty/git.git] / mergetools /
2022-12-13  Junio C HamanoMerge branch 'maint-2.36' into maint-2.37
2022-12-13  Junio C HamanoMerge branch 'maint-2.33' into maint-2.34
2022-12-13  Junio C HamanoSync with Git 2.32.5
2022-12-13  Junio C HamanoSync with Git 2.30.7
2022-12-09  Junio C HamanoMerge branch 'ps/attr-limits' into maint-2.32
2022-10-06  Taylor BlauSync with 2.36.3
2022-10-06  Taylor BlauSync with 2.33.5
2022-10-06  Taylor BlauSync with 2.32.4
2022-10-06  Taylor BlauSync with 2.30.6
2022-09-13  Junio C HamanoMerge branch 'en/merge-unstash-only-on-clean-merge...
2022-09-13  Junio C HamanoMerge branch 'ds/github-actions-use-newer-ubuntu' into...
2022-09-13  Junio C HamanoMerge branch 'ad/preload-plug-memleak' into maint
2022-09-13  Junio C HamanoMerge branch 'sg/xcalloc-cocci-fix' into maint
2022-09-13  Junio C HamanoMerge branch 'jk/pipe-command-nonblock' into maint
2022-09-13  Junio C HamanoMerge branch 'jk/is-promisor-object-keep-tree-in-use...
2022-08-26  Junio C HamanoMerge branch 'po/doc-add-renormalize' into maint
2022-08-26  Junio C HamanoMerge branch 'vd/sparse-reset-checkout-fixes' into...
2022-08-26  Junio C HamanoMerge branch 'jk/fsck-tree-mode-bits-fix' into maint
2022-08-26  Junio C HamanoMerge branch 'fc/vimdiff-layout-vimdiff3-fix' into...
2022-08-26  Junio C HamanoMerge branch 'js/safe-directory-plus' into maint
2022-08-26  Junio C HamanoMerge branch 'ab/hooks-regression-fix' into maint
2022-08-26  Junio C HamanoMerge branch 'js/ort-clean-up-after-failed-merge' into...
2022-08-26  Junio C HamanoMerge branch 'js/lstat-mingw-enotdir-fix' into maint
2022-08-26  Junio C HamanoMerge branch 'ca/unignore-local-installation-on-windows...
2022-08-11  Junio C HamanoMerge branch 'jc/string-list-cleanup' into maint
2022-08-11  Junio C HamanoMerge branch 'mt/pkt-line-comment-tweak' into maint
2022-08-11  Junio C HamanoMerge branch 'ma/t4200-update' into maint
2022-08-11  Junio C HamanoMerge branch 'tb/commit-graph-genv2-upgrade-fix' into...
2022-08-11  Junio C HamanoMerge branch 'tk/untracked-cache-with-uall' into maint
2022-08-11  Junio C HamanoMerge branch 'mt/checkout-count-fix' into maint
2022-08-11  Junio C HamanoMerge branch 'cl/rerere-train-with-no-sign' into maint
2022-08-11  Junio C HamanoMerge branch 'kk/p4-client-name-encoding-fix' into...
2022-08-11  Junio C HamanoMerge branch 'mb/p4-utf16-crlf' into maint
2022-08-11  Junio C HamanoMerge branch 'hx/lookup-commit-in-graph-fix' into maint
2022-08-11  Junio C HamanoMerge branch 'jc/resolve-undo' into maint
2022-08-10  Felipe Contrerasmergetools: vimdiff: simplify tabfirst
2022-08-10  Felipe Contrerasmergetools: vimdiff: fix single window layouts
2022-08-10  Felipe Contrerasmergetools: vimdiff: rework tab logic
2022-08-10  Felipe Contrerasmergetools: vimdiff: fix for diffopt
2022-08-10  Felipe Contrerasmergetools: vimdiff: silence annoying messages
2022-08-10  Felipe Contrerasmergetools: vimdiff: make vimdiff3 actually work
2022-08-10  Felipe Contrerasmergetools: vimdiff: fix comment
2022-08-05  Junio C HamanoMerge branch 'sg/index-format-doc-update' into maint
2022-08-05  Junio C HamanoMerge branch 'ma/sparse-checkout-cone-doc-fix' into...
2022-08-05  Junio C HamanoMerge branch 'ds/win-syslog-compiler-fix' into maint
2022-08-05  Junio C HamanoMerge branch 'ld/osx-keychain-usage-fix' into maint
2022-08-05  Junio C HamanoMerge branch 'ds/doc-wo-whitelist' into maint
2022-08-05  Junio C HamanoMerge branch 'mb/config-document-include' into maint
2022-08-05  Junio C HamanoMerge branch 'rs/mingw-tighten-mkstemp' into maint
2022-08-05  Junio C HamanoMerge branch 'jk/clone-unborn-confusion' into maint
2022-07-27  Junio C HamanoMerge branch 'tk/rev-parse-doc-clarify-at-u' into maint
2022-07-27  Junio C HamanoMerge branch 'll/ls-files-tests-update' into maint
2022-07-27  Junio C HamanoMerge branch 'ds/t5510-brokequote' into maint
2022-07-27  Junio C HamanoMerge branch 'tb/pack-objects-remove-pahole-comment...
2022-07-27  Junio C HamanoMerge branch 'en/t6429-test-must-be-empty-fix' into...
2022-07-27  Junio C HamanoMerge branch 'ds/vscode-settings' into maint
2022-07-27  Junio C HamanoMerge branch 'cr/setup-bug-typo' into maint
2022-07-27  Junio C HamanoMerge branch 'pb/diff-doc-raw-format' into maint
2022-07-27  Junio C HamanoMerge branch 'jk/revisions-doc-markup-fix' into maint
2022-07-27  Junio C HamanoMerge branch 'rs/combine-diff-with-incompatible-options...
2022-07-27  Junio C HamanoMerge branch 'ac/bitmap-format-doc' into maint
2022-07-27  Junio C HamanoMerge branch 'ab/test-quoting-fix' into maint
2022-07-27  Junio C HamanoMerge branch 'ro/mktree-allow-missing-fix' into maint
2022-07-27  Junio C HamanoMerge branch 'dr/i18n-die-warn-error-usage' into maint
2022-07-27  Junio C HamanoMerge branch 'ds/git-rebase-doc-markup' into maint
2022-07-27  Junio C HamanoMerge branch 'gg/worktree-from-the-above' into maint
2022-07-27  Junio C HamanoMerge branch 'fr/vimdiff-layout-fix' into maint
2022-07-27  Junio C HamanoMerge branch 'en/merge-dual-dir-renames-fix' into maint
2022-07-27  Junio C HamanoMerge branch 'jk/diff-files-cleanup-fix' into maint
2022-07-27  Junio C HamanoMerge branch 'js/vimdiff-quotepath-fix' into maint
2022-07-14  Johannes Schindelinmergetool(vimdiff): allow paths to contain spaces again
2022-07-08  Fernando Ramosvimdiff: make layout engine more robust against user...
2022-07-04  Junio C HamanoMerge 'js/add-i-delete' into maint-2.37
2022-06-27  Junio C HamanoSync with Git 2.36.2
2022-06-27  Junio C HamanoMerge branch 'jc/revert-show-parent-info'
2022-06-23  Johannes SchindelinSync with 2.33.4
2022-06-23  Johannes SchindelinSync with 2.32.3
2022-06-23  Johannes SchindelinSync with 2.30.5
2022-06-22  Junio C HamanoMerge branch 'tb/cruft-packs'
2022-06-18  Junio C HamanoMerge branch 'cb/path-owner-check-with-sudo-plus'
2022-06-17  Junio C HamanoMerge branch 'jc/cocci-cleanup'
2022-06-17  Junio C HamanoMerge branch 'jk/perf-lib-test-titles'
2022-06-15  Junio C HamanoMerge branch 'fs/ssh-default-key-command-doc'
2022-06-15  Junio C HamanoMerge branch 'po/rebase-preserve-merges'
2022-06-15  Junio C HamanoMerge branch 'jc/revert-show-parent-info'
2022-06-13  Junio C HamanoMerge branch 'gc/document-config-worktree-scope'
2022-06-13  Junio C HamanoMerge branch 'js/wait-or-whine-can-fail'
2022-06-13  Junio C HamanoMerge branch 'ab/remote-free-fix'
2022-06-13  Junio C HamanoMerge branch 'sn/fsmonitor-missing-clock'
2022-06-13  Junio C HamanoMerge branch 'zh/read-cache-copy-name-entry-fix'
2022-06-13  Junio C HamanoMerge branch 'tb/show-ref-optim'
2022-06-13  Junio C HamanoMerge branch 'ds/credentials-in-url'
2022-06-13  Junio C HamanoMerge branch 'ab/hooks-regression-fix'
2022-06-13  Junio C HamanoMerge branch 'tl/ls-tree-oid-only'
2022-06-10  Junio C HamanoMerge branch 'jh/builtin-fsmonitor-part3'
2022-06-10  Junio C HamanoMerge branch 'gc/zero-length-branch-config-fix'
2022-06-10  Junio C HamanoMerge branch 'ab/env-array'
2022-06-10  Junio C HamanoMerge branch 'cb/buggy-gcc-12-workaround'
2022-06-08  Junio C HamanoSync with 'maint'
2022-06-07  Junio C HamanoMerge branch 'jc/all-negative-pathspec'
next