Merge branch 'jk/blame-fixes' into maint
[git] / mergetools / araxis
2017-01-31  Junio C HamanoMerge branch 'jk/blame-fixes' into maint
2017-01-31  Junio C HamanoMerge branch 'jk/archive-zip-userdiff-config' into...
2017-01-31  Junio C HamanoMerge branch 'dt/disable-bitmap-in-auto-gc' into maint
2017-01-31  Junio C HamanoMerge branch 'nd/config-misc-fixes' into maint
2017-01-31  Junio C HamanoMerge branch 'jc/abbrev-autoscale-config' into maint
2017-01-31  Junio C HamanoMerge branch 'mh/fast-import-notes-fix-new' into maint
2017-01-31  Junio C HamanoMerge branch 'jc/compression-config' into maint
2017-01-31  Junio C HamanoMerge branch 'ew/svn-fixes' into maint
2017-01-31  Junio C HamanoMerge branch 'jk/make-tags-find-sources-tweak' into...
2017-01-31  Junio C HamanoMerge branch 'jc/latin-1' into maint
2017-01-17  Junio C HamanoMerge branch 'mm/gc-safety-doc' into maint
2017-01-17  Junio C HamanoMerge branch 'mm/push-social-engineering-attack-doc...
2017-01-17  Junio C HamanoMerge branch 'jt/fetch-no-redundant-tag-fetch-map'...
2017-01-17  Junio C HamanoMerge branch 'ls/filter-process' into maint
2017-01-17  Junio C HamanoMerge branch 'kh/tutorial-grammofix' into maint
2017-01-17  Junio C HamanoMerge branch 'lr/doc-fix-cet' into maint
2017-01-17  Junio C HamanoMerge branch 'sb/t3600-cleanup' into maint
2017-01-17  Junio C HamanoMerge branch 'jk/readme-gmane-is-no-more' into maint
2017-01-17  Junio C HamanoMerge branch 'sb/unpack-trees-grammofix' into maint
2017-01-17  Junio C HamanoMerge branch 'ls/t0021-fixup' into maint
2017-01-17  Junio C HamanoMerge branch 'ak/lazy-prereq-mktemp' into maint
2017-01-17  Junio C HamanoMerge branch 'nd/qsort-in-merge-recursive' into maint
2017-01-17  Junio C HamanoMerge branch 'dt/smart-http-detect-server-going-away...
2017-01-17  Junio C HamanoMerge branch 'mk/mingw-winansi-ttyname-termination...
2017-01-17  Junio C HamanoMerge branch 'gv/p4-multi-path-commit-fix' into maint
2017-01-17  Junio C HamanoMerge branch 'jk/difftool-in-subdir' into maint
2017-01-17  Junio C HamanoMerge branch 'ld/p4-compare-dir-vs-symlink' into maint
2017-01-17  Junio C HamanoMerge branch 'jc/push-default-explicit' into maint
2017-01-17  Junio C HamanoMerge branch 'jt/mailinfo-fold-in-body-headers' into...
2017-01-17  Junio C HamanoMerge branch 'jk/index-pack-wo-repo-from-stdin' into...
2017-01-17  Junio C HamanoMerge branch 'jk/parseopt-usage-msg-opt' into maint
2017-01-17  Junio C HamanoMerge branch 'jk/quote-env-path-list-component' into...
2017-01-17  Junio C HamanoMerge branch 'nd/shallow-fixup' into maint
2017-01-17  Junio C HamanoMerge branch 'sb/sequencer-abort-safety' into maint
2017-01-17  Junio C HamanoMerge branch 'da/mergetool-xxdiff-hotkey' into maint
2017-01-17  Junio C HamanoMerge branch 'jc/pull-rebase-ff' into maint
2017-01-17  Junio C HamanoMerge branch 'js/normalize-path-copy-ceil' into maint
2017-01-17  Junio C HamanoMerge branch 'ak/commit-only-allow-empty' into maint
2017-01-17  Junio C HamanoMerge branch 'da/difftool-dir-diff-fix' into maint
2017-01-17  Junio C HamanoMerge branch 'jb/diff-no-index-no-abbrev' into maint
2017-01-17  Junio C HamanoMerge branch 'jk/stash-disable-renames-internally'...
2017-01-17  Junio C HamanoMerge branch 'jk/http-walker-limit-redirect' into maint
2017-01-17  Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf...
2017-01-17  Junio C HamanoMerge branch 'ls/p4-empty-file-on-lfs' into maint
2017-01-17  Junio C HamanoMerge branch 'da/mergetool-trust-exit-code' into maint
2016-11-29  David Aguilarmergetool: honor mergetool.$tool.trustExitCode for...
2016-10-20  Junio C HamanoMerge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-26  Junio C HamanoMerge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26  Junio C HamanoMerge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11  Junio C HamanoMerge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07  Junio C HamanoMerge branch 'sy/i18n' of git-gui
2016-08-31  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix'
2016-07-28  Junio C HamanoMerge branch 'js/t3404-grammo-fix' into maint
2016-07-13  Junio C HamanoMerge branch 'js/t3404-grammo-fix'
2016-05-26  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18  Junio C HamanoMerge branch 'rn/glossary-typofix' into HEAD
2016-05-17  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix'
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix'
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix'
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test'
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix'
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint
2015-06-01  Junio C HamanoMerge branch 'mc/commit-doc-grammofix'
2015-05-26  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long' into...
2015-05-11  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long'
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-05  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-17  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07  Junio C HamanoMerge branch 'sb/t5400-remove-unused'
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date'
2014-11-18  Junio C HamanoMerge branch 'jc/doc-commit-only'
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-02-27  Junio C HamanoMerge branch 'bs/stdio-undef-before-redef'
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
next