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

]> git.ipfire.org Git - thirdparty/git.git/history - mergetools/tortoisemerge

projects / thirdparty / git.git / history

[thirdparty/git.git] / mergetools / tortoisemerge

2017-09-22	Junio C Hamano	Sync with 2.10.5	blob \| commitdiff \| raw
2017-07-30	Junio C Hamano	Merge tag 'v2.10.4' into maint-2.11	blob \| commitdiff \| raw
2017-05-05	Junio C Hamano	Merge branch 'maint-2.10' into maint-2.11	blob \| commitdiff \| raw
2017-02-02	Junio C Hamano	Merge branch 'ws/request-pull-code-cleanup' into maint	blob \| commitdiff \| raw
2017-02-02	Junio C Hamano	Merge branch 'jk/execv-dashed-external' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'js/mingw-isatty' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'jk/coding-guidelines-update' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'js/exec-path-coverity-workaround' into...	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'ad/bisect-terms' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'jk/grep-e-could-be-extended-beyond-posix...	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'km/branch-get-push-while-detached' into...	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'jk/rebase-i-squash-count-fix' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'jk/blame-fixes' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'jk/archive-zip-userdiff-config' into...	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'dt/disable-bitmap-in-auto-gc' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'nd/config-misc-fixes' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'jc/abbrev-autoscale-config' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'mh/fast-import-notes-fix-new' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'jc/compression-config' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'ew/svn-fixes' into maint	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'jk/make-tags-find-sources-tweak' into...	blob \| commitdiff \| raw
2017-01-31	Junio C Hamano	Merge branch 'jc/latin-1' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'mm/gc-safety-doc' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'mm/push-social-engineering-attack-doc...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jt/fetch-no-redundant-tag-fetch-map'...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ls/filter-process' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'kh/tutorial-grammofix' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'lr/doc-fix-cet' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'sb/t3600-cleanup' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/readme-gmane-is-no-more' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'sb/unpack-trees-grammofix' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ls/t0021-fixup' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ak/lazy-prereq-mktemp' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'nd/qsort-in-merge-recursive' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'dt/smart-http-detect-server-going-away...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'mk/mingw-winansi-ttyname-termination...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'gv/p4-multi-path-commit-fix' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/difftool-in-subdir' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ld/p4-compare-dir-vs-symlink' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jc/push-default-explicit' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jt/mailinfo-fold-in-body-headers' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/index-pack-wo-repo-from-stdin' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/parseopt-usage-msg-opt' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/quote-env-path-list-component' into...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'nd/shallow-fixup' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'sb/sequencer-abort-safety' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'da/mergetool-xxdiff-hotkey' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jc/pull-rebase-ff' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'js/normalize-path-copy-ceil' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ak/commit-only-allow-empty' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'da/difftool-dir-diff-fix' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jb/diff-no-index-no-abbrev' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/stash-disable-renames-internally'...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jk/http-walker-limit-redirect' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'jc/renormalize-merge-kill-safer-crlf...	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'ls/p4-empty-file-on-lfs' into maint	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'da/mergetool-trust-exit-code' into maint	blob \| commitdiff \| raw
2016-11-29	David Aguilar	mergetool: honor mergetool.$tool.trustExitCode for...	blob \| commitdiff \| raw
2016-10-20	Junio C Hamano	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'va/i18n' of ../git-gui into va/git-gui...	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'rs/use-modern-git-merge-syntax' of git...	blob \| commitdiff \| raw \| diff to current
2016-09-11	Junio C Hamano	Merge branch 'js/commit-gpgsign' of ../git-gui into...	blob \| commitdiff \| raw \| diff to current
2016-09-09	Junio C Hamano	Merge branch 'ls/packet-line-protocol-doc-fix' into...	blob \| commitdiff \| raw \| diff to current
2016-09-07	Junio C Hamano	Merge branch 'sy/i18n' of git-gui	blob \| commitdiff \| raw \| diff to current
2016-08-31	Junio C Hamano	Merge branch 'ls/packet-line-protocol-doc-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'js/t3404-grammo-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'js/t3404-grammo-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'cb/t7810-test-label-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'cb/t7810-test-label-fix'	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'rn/glossary-typofix' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2016-05-10	Junio C Hamano	Merge branch 'rn/glossary-typofix'	blob \| commitdiff \| raw \| diff to current
2016-03-21	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2016-02-22	Junio C Hamano	Merge branch 'jk/config-include'	blob \| commitdiff \| raw \| diff to current
2015-12-21	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-11-05	Junio C Hamano	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| commitdiff \| raw \| diff to current
2015-11-03	Junio C Hamano	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| commitdiff \| raw \| diff to current
2015-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-10-16	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| commitdiff \| raw \| diff to current
2015-10-05	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix'	blob \| commitdiff \| raw \| diff to current
2015-09-14	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-09-14	Junio C Hamano	Merge branch 'mp/t7060-diff-index-test'	blob \| commitdiff \| raw \| diff to current
2015-09-14	Junio C Hamano	Merge branch 'gb/apply-comment-typofix'	blob \| commitdiff \| raw \| diff to current
2015-09-04	Junio C Hamano	Merge branch 'ee/clean-test-fixes' into maint	blob \| commitdiff \| raw \| diff to current
2015-09-04	Junio C Hamano	Merge branch 'sg/t3020-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-09-02	Junio C Hamano	Merge branch 'ee/clean-test-fixes'	blob \| commitdiff \| raw \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/reflog-typofix-in-error'	blob \| commitdiff \| raw \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/read-tree-usage-string'	blob \| commitdiff \| raw \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/pack-objects-usage-strings'	blob \| commitdiff \| raw \| diff to current
2015-08-26	Junio C Hamano	Merge branch 'sg/t3020-typofix'	blob \| commitdiff \| raw \| diff to current
2015-07-15	Junio C Hamano	Merge branch 'fk/doc-format-patch-vn' into maint	blob \| commitdiff \| raw \| diff to current
2015-06-24	Junio C Hamano	Merge branch 'fk/doc-format-patch-vn'	blob \| commitdiff \| raw \| diff to current
2015-06-16	Junio C Hamano	Merge branch 'mc/commit-doc-grammofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-06-01	Junio C Hamano	Merge branch 'mc/commit-doc-grammofix'	blob \| commitdiff \| raw \| diff to current
2015-05-26	Junio C Hamano	Merge branch 'sg/complete-decorate-full-not-long' into...	blob \| commitdiff \| raw \| diff to current
2015-05-13	Junio C Hamano	Merge branch 'ep/fix-test-lib-functions-report' into...	blob \| commitdiff \| raw \| diff to current
2015-05-11	Junio C Hamano	Merge branch 'sg/complete-decorate-full-not-long'	blob \| commitdiff \| raw \| diff to current
2015-05-06	Junio C Hamano	Merge branch 'ep/fix-test-lib-functions-report'	blob \| commitdiff \| raw \| diff to current
2015-04-28	Junio C Hamano	Merge branch 'mg/show-notes-doc'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom