Andrew's git - gitweb.git/history

[gitweb.git] / mergetools / ecmerge

2017-01-10	Merge branch 'jc/retire-compaction-heuristics'	blob \| diff \| raw
2017-01-10	Merge branch 'nd/config-misc-fixes'	blob \| diff \| raw
2017-01-10	Merge branch 'jc/abbrev-autoscale-config'	blob \| diff \| raw
2017-01-10	Merge branch 'mh/fast-import-notes-fix-new'	blob \| diff \| raw
2017-01-10	Merge branch 'jc/git-open-cloexec'	blob \| diff \| raw
2017-01-10	Merge branch 'jc/compression-config'	blob \| diff \| raw
2017-01-10	Merge branch 'dt/smart-http-detect-server-going-away'	blob \| diff \| raw
2017-01-10	Merge branch 'mm/gc-safety-doc'	blob \| diff \| raw
2017-01-10	Merge branch 'mm/push-social-engineering-attack-doc'	blob \| diff \| raw
2017-01-10	Merge branch 'jt/fetch-no-redundant-tag-fetch-map'	blob \| diff \| raw
2017-01-10	Merge branch 'jc/latin-1'	blob \| diff \| raw
2017-01-02	Merge branch 'master' of https://github.com/Softcatala...	blob \| diff \| raw
2016-12-27	Merge branch 'jc/lock-report-on-error'	blob \| diff \| raw
2016-12-27	Merge branch 'js/mingw-isatty'	blob \| diff \| raw
2016-12-27	Merge branch 'ls/p4-lfs'	blob \| diff \| raw
2016-12-27	Merge branch 'va/i18n-even-more'	blob \| diff \| raw
2016-12-27	Merge branch 'lt/shortlog-by-committer'	blob \| diff \| raw
2016-12-27	Merge branch 'mk/mingw-winansi-ttyname-termination...	blob \| diff \| raw
2016-12-27	Merge branch 'gv/p4-multi-path-commit-fix'	blob \| diff \| raw
2016-12-27	Merge branch 'jk/difftool-in-subdir'	blob \| diff \| raw
2016-12-27	Merge branch 'ld/p4-compare-dir-vs-symlink'	blob \| diff \| raw
2016-12-27	Merge branch 'ls/filter-process'	blob \| diff \| raw
2016-12-27	Merge branch 'bw/transport-protocol-policy'	blob \| diff \| raw
2016-12-27	Merge branch 'cp/merge-continue'	blob \| diff \| raw
2016-12-27	Merge branch 'va/i18n-perl-scripts'	blob \| diff \| raw
2016-12-27	Merge branch 'sb/submodule-config-cleanup'	blob \| diff \| raw
2016-12-27	Merge branch 'jc/push-default-explicit'	blob \| diff \| raw
2016-12-21	Merge branch 'jt/mailinfo-fold-in-body-headers'	blob \| diff \| raw
2016-12-21	Merge branch 'jk/index-pack-wo-repo-from-stdin'	blob \| diff \| raw
2016-12-21	Merge branch 'jk/parseopt-usage-msg-opt'	blob \| diff \| raw
2016-12-21	Merge branch 'jk/quote-env-path-list-component'	blob \| diff \| raw
2016-12-21	Merge branch 'vs/submodule-clone-nested-submodules...	blob \| diff \| raw
2016-12-21	Merge branch 'nd/shallow-fixup'	blob \| diff \| raw
2016-12-21	Merge branch 'sb/sequencer-abort-safety'	blob \| diff \| raw
2016-12-19	Merge branch 'kh/tutorial-grammofix'	blob \| diff \| raw
2016-12-19	Merge branch 'da/mergetool-xxdiff-hotkey'	blob \| diff \| raw
2016-12-19	Merge branch 'lr/doc-fix-cet'	blob \| diff \| raw
2016-12-19	Merge branch 'sb/t3600-cleanup'	blob \| diff \| raw
2016-12-19	Merge branch 'jc/pull-rebase-ff'	blob \| diff \| raw
2016-12-19	Merge branch 'ld/p4-worktree'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/make-tags-find-sources-tweak'	blob \| diff \| raw
2016-12-19	Merge branch 'js/normalize-path-copy-ceil'	blob \| diff \| raw
2016-12-19	Merge branch 'bb/unicode-9.0'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/readme-gmane-is-no-more'	blob \| diff \| raw
2016-12-19	Merge branch 'jc/lock-report-on-error'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/xdiff-drop-xdl-fast-hash'	blob \| diff \| raw
2016-12-19	Merge branch 'nd/rebase-forget'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/trailers-placeholder-in-pretty'	blob \| diff \| raw
2016-12-19	Merge branch 'ak/commit-only-allow-empty'	blob \| diff \| raw
2016-12-19	Merge branch 'da/difftool-dir-diff-fix'	blob \| diff \| raw
2016-12-19	Merge branch 'jb/diff-no-index-no-abbrev'	blob \| diff \| raw
2016-12-19	Merge branch 'rj/git-version-gen-do-not-force-abbrev'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/stash-disable-renames-internally'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/http-walker-limit-redirect'	blob \| diff \| raw
2016-12-19	Merge branch 'jk/http-walker-limit-redirect-2.9'	blob \| diff \| raw
2016-12-19	Merge branch 'nd/for-each-ref-ignore-case'	blob \| diff \| raw
2016-12-19	Merge branch 'sb/unpack-trees-grammofix'	blob \| diff \| raw
2016-12-19	Merge branch 'ls/travis-update-p4-and-lfs'	blob \| diff \| raw
2016-12-19	Merge branch 'ls/t0021-fixup'	blob \| diff \| raw
2016-12-19	Merge branch 'ah/grammos'	blob \| diff \| raw
2016-12-19	Merge branch 'jc/renormalize-merge-kill-safer-crlf'	blob \| diff \| raw
2016-12-19	Merge branch 'jt/use-trailer-api-in-commands'	blob \| diff \| raw
2016-12-16	Merge branch 'ls/p4-retry-thrice'	blob \| diff \| raw
2016-12-16	Merge branch 'ls/p4-empty-file-on-lfs'	blob \| diff \| raw
2016-12-16	Merge branch 'ld/p4-update-shelve'	blob \| diff \| raw
2016-12-16	Merge branch 'vk/p4-submit-shelve'	blob \| diff \| raw
2016-12-16	Merge branch 'da/mergetool-trust-exit-code'	blob \| diff \| raw
2016-11-29	mergetool: honor mergetool.$tool.trustExitCode for...	blob \| diff \| raw
2016-10-20	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2016-09-26	Merge branch 'va/i18n' of ../git-gui into va/git-gui...	blob \| diff \| raw \| diff to current
2016-09-26	Merge branch 'rs/use-modern-git-merge-syntax' of git...	blob \| diff \| raw \| diff to current
2016-09-11	Merge branch 'js/commit-gpgsign' of ../git-gui into...	blob \| diff \| raw \| diff to current
2016-09-09	Merge branch 'ls/packet-line-protocol-doc-fix' into...	blob \| diff \| raw \| diff to current
2016-09-07	Merge branch 'sy/i18n' of git-gui	blob \| diff \| raw \| diff to current
2016-08-31	Merge branch 'ls/packet-line-protocol-doc-fix'	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'js/t3404-grammo-fix' into maint	blob \| diff \| raw \| diff to current
2016-07-13	Merge branch 'js/t3404-grammo-fix'	blob \| diff \| raw \| diff to current
2016-05-26	Merge branch 'va/mailinfo-doc-typofix' into maint	blob \| diff \| raw \| diff to current
2016-05-18	Merge branch 'rn/glossary-typofix' into HEAD	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'va/mailinfo-doc-typofix'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'rn/glossary-typofix'	blob \| diff \| raw \| diff to current
2016-03-21	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-12-21	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-10-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/make-findstring-makeflags-fix'	blob \| diff \| raw \| diff to current
2015-09-14	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'mp/t7060-diff-index-test'	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'gb/apply-comment-typofix'	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'sg/t3020-typofix' into maint	blob \| diff \| raw \| diff to current
2015-08-26	Merge branch 'sg/t3020-typofix'	blob \| diff \| raw \| diff to current
2015-06-16	Merge branch 'mc/commit-doc-grammofix' into maint	blob \| diff \| raw \| diff to current
2015-06-01	Merge branch 'mc/commit-doc-grammofix'	blob \| diff \| raw \| diff to current
2015-05-26	Merge branch 'sg/complete-decorate-full-not-long' into...	blob \| diff \| raw \| diff to current
2015-05-11	Merge branch 'sg/complete-decorate-full-not-long'	blob \| diff \| raw \| diff to current
2015-04-19	Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui	blob \| diff \| raw \| diff to current
2015-03-24	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-03-05	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| diff \| raw \| diff to current
2015-02-25	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| diff \| raw \| diff to current
2015-02-25	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| diff \| raw \| diff to current
next