git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - git-mergetool.sh

projects / thirdparty / git.git / history

2021-03-14	Junio C Hamano	Merge branch 'jn/mergetool-hideresolved-is-optional'	blob \| commitdiff \| raw
2021-03-14	Junio C Hamano	Merge branch 'tb/pack-revindex-on-disk'	blob \| commitdiff \| raw \| diff to current
2021-03-14	Jiang Xin	Merge branch 'master' of github.com:Softcatala/git-po	blob \| commitdiff \| raw \| diff to current
2021-03-14	Jiang Xin	Merge branch 'russian-l10n' of github.com:DJm00n/git...	blob \| commitdiff \| raw \| diff to current
2021-03-13	Jonathan Nieder	mergetool: do not enable hideResolved by default	blob \| commitdiff \| raw
2021-03-09	Junio C Hamano	Sync with Git 2.30.2 for CVE-2021-21300	blob \| commitdiff \| raw \| diff to current
2021-03-09	Junio C Hamano	Merge branch 'jt/transfer-fsck-across-packs-fix'	blob \| commitdiff \| raw \| diff to current
2021-03-04	Junio C Hamano	Merge branch 'jk/open-returns-eintr'	blob \| commitdiff \| raw \| diff to current
2021-03-04	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge branch 'jh/untracked-cache-fix'	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge branch 'hv/trailer-formatting'	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge branch 'sv/t7001-modernize'	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge branch 'jt/transfer-fsck-across-packs'	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge branch 'ds/chunked-file-api'	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge branch 'en/diffcore-rename'	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge branch 'jh/fsmonitor-prework'	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge branch 'js/commit-graph-warning'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'jc/push-delete-nothing'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'dl/doc-config-camelcase'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'js/params-vs-args'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'ug/doc-commit-approxidate'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'ds/merge-base-independent'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'ah/rebase-no-fork-point-config'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'mt/grep-sparse-checkout'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'zh/difftool-skip-to'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'cw/pack-config-doc'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'jc/maint-column-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'ma/doc-markup-fix'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'jc/diffcore-rotate'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'mt/checkout-index-corner-cases'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'js/doc-proto-v2-response-end'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'rs/blame-optim'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'mz/doc-notes-are-not-anchors'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'ab/detox-gettext-tests'	blob \| commitdiff \| raw \| diff to current
2021-02-26	Junio C Hamano	Merge branch 'jk/rev-list-disk-usage'	blob \| commitdiff \| raw \| diff to current
2021-02-24	Junio C Hamano	Merge branch 'ds/chunked-file-api' into tb/reverse...	blob \| commitdiff \| raw \| diff to current
2021-02-23	Junio C Hamano	Merge branch 'ab/test-lib'	blob \| commitdiff \| raw \| diff to current
2021-02-23	Junio C Hamano	Merge branch 'ab/diff-deferred-free'	blob \| commitdiff \| raw \| diff to current
2021-02-23	Junio C Hamano	Merge branch 'ab/pager-exit-log'	blob \| commitdiff \| raw \| diff to current
2021-02-23	Junio C Hamano	Merge branch 'ta/hash-function-transition-doc'	blob \| commitdiff \| raw \| diff to current
2021-02-23	Junio C Hamano	Merge branch 'bc/signed-objects-with-both-hashes'	blob \| commitdiff \| raw \| diff to current
2021-02-23	Junio C Hamano	Merge branch 'dl/stash-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'ak/config-bad-bool-error'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'js/reflog-expire-stale-fix'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'js/commit-graph-warning'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'ew/rev-parse-since-test'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'ds/maintenance-pack-refs'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'jx/t5411-unique-filenames'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'js/fsck-name-objects-fix'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'jk/mailmap-only-at-root'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'mt/grep-cached-untracked'	blob \| commitdiff \| raw \| diff to current
2021-02-18	Junio C Hamano	Merge branch 'sh/mergetool-hideresolved'	blob \| commitdiff \| raw \| diff to current
2021-02-12	Johannes Schindelin	Sync with 2.22.5	blob \| commitdiff \| raw \| diff to current
2021-02-12	Johannes Schindelin	Sync with 2.21.4	blob \| commitdiff \| raw \| diff to current
2021-02-12	Johannes Schindelin	Sync with 2.19.6	blob \| commitdiff \| raw \| diff to current
2021-02-12	Johannes Schindelin	Sync with 2.18.5	blob \| commitdiff \| raw \| diff to current
2021-02-09	Seth House	mergetool: add per-tool support and overrides for the...	blob \| commitdiff \| raw \| diff to current
2021-02-09	Seth House	mergetool: break setup_tool out into separate initializ...	blob \| commitdiff \| raw \| diff to current
2021-02-09	Seth House	mergetool: add hideResolved configuration	blob \| commitdiff \| raw \| diff to current
2021-02-06	Junio C Hamano	Merge branch 'jk/forbid-lf-in-git-url' into maint	blob \| commitdiff \| raw \| diff to current
2021-01-25	Junio C Hamano	Merge branch 'jk/forbid-lf-in-git-url'	blob \| commitdiff \| raw \| diff to current
2020-12-18	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-12-17	Junio C Hamano	Merge branch 'jb/midx-doc-update'	blob \| commitdiff \| raw \| diff to current
2020-12-08	Junio C Hamano	Merge branch 'sn/config-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2020-11-30	Junio C Hamano	Merge branch 'km/stash-error-message-fix'	blob \| commitdiff \| raw \| diff to current
2020-10-17	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-10-03	Junio C Hamano	Merge remote-tracking branch 'paulus/master' into pm...	blob \| commitdiff \| raw \| diff to current
2020-07-31	Junio C Hamano	Merge branch 'jb/doc-packfile-name' into master	blob \| commitdiff \| raw \| diff to current
2020-07-20	Junio C Hamano	Merge https://github.com/prati0100/git-gui into master	blob \| commitdiff \| raw \| diff to current
2020-06-09	Junio C Hamano	Merge branch 'cb/bisect-helper-parser-fix'	blob \| commitdiff \| raw \| diff to current
2020-06-09	Junio C Hamano	Merge branch 'vs/complete-stash-show-p-fix'	blob \| commitdiff \| raw \| diff to current
2020-05-25	Junio C Hamano	Merge branch 'ds/multi-pack-verify'	blob \| commitdiff \| raw \| diff to current
2020-05-21	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-05-14	Junio C Hamano	Merge branch 'js/rebase-autosquash-double-fixup-fix'	blob \| commitdiff \| raw \| diff to current
2020-05-08	Junio C Hamano	Merge branch 'cb/t0000-use-the-configured-shell'	blob \| commitdiff \| raw \| diff to current
2020-05-08	Junio C Hamano	Merge branch 'jk/for-each-ref-multi-key-sort-fix'	blob \| commitdiff \| raw \| diff to current
2020-05-08	Junio C Hamano	Merge branch 'cb/credential-store-ignore-bogus-lines'	blob \| commitdiff \| raw \| diff to current
2020-05-05	Junio C Hamano	Merge branch 'js/partial-urlmatch-2.17'	blob \| commitdiff \| raw \| diff to current
2020-05-01	Junio C Hamano	Merge branch 'ds/multi-pack-index'	blob \| commitdiff \| raw \| diff to current
2020-04-29	Junio C Hamano	Sync with js/partial-urlmatch-2.17	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'ds/t5319-touch-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'ds/commit-graph-expiry-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'jc/missing-ref-store-fix'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'js/t0007-typofix'	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'dl/wrapper-fix-indentation'	blob \| commitdiff \| raw \| diff to current
2020-04-19	Jonathan Nieder	Git 2.23.3 v2.23.3	blob \| commitdiff \| raw \| diff to current
2020-04-19	Jonathan Nieder	Git 2.22.4 v2.22.4	blob \| commitdiff \| raw \| diff to current
2020-04-19	Jonathan Nieder	Git 2.20.4 v2.20.4	blob \| commitdiff \| raw \| diff to current
2020-04-19	Jonathan Nieder	Git 2.19.5 v2.19.5	blob \| commitdiff \| raw \| diff to current
2020-03-25	Junio C Hamano	Merge branch 'en/oidset-uninclude-hashmap'	blob \| commitdiff \| raw \| diff to current
2020-03-25	Junio C Hamano	Merge branch 'sg/commit-slab-clarify-peek'	blob \| commitdiff \| raw \| diff to current
2020-03-19	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'jc/doc-single-h-is-for-help' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'hd/show-one-mergetag-fix' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Merge branch 'hi/gpg-use-check-signature' into maint	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Git 2.23.2 v2.23.2	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Git 2.22.3 v2.22.3	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Git 2.20.3 v2.20.3	blob \| commitdiff \| raw \| diff to current
2020-03-17	Junio C Hamano	Git 2.19.4 v2.19.4	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom