Merge branch 'jk/colors'
[git] / mergetools / kdiff3
2014-12-22  Junio C HamanoMerge branch 'jk/colors'
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date'
2014-12-22  Junio C HamanoMerge branch 'js/test-hashmap-squelch-gcc'
2014-12-22  Junio C HamanoMerge branch 'js/fsck-tag-validation'
2014-12-22  Junio C HamanoMerge branch 'po/doc-assume-unchanged'
2014-12-22  Junio C HamanoMerge branch 'mg/branch-d-m-f'
2014-12-22  Junio C HamanoMerge branch 'tb/t0027-eol-conversion'
2014-12-22  Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse'
2014-12-22  Junio C HamanoMerge branch 'sb/string-list'
2014-12-22  Junio C HamanoMerge branch 'sv/doc-stripspace'
2014-12-22  Junio C HamanoMerge branch 'rt/completion-tag'
2014-12-22  Junio C HamanoMerge branch 'mg/doc-check-ignore-tracked-are-not-ignored'
2014-12-22  Junio C HamanoMerge branch 'jk/credential-quit'
2014-12-22  Junio C HamanoMerge branch 'dm/compat-s-ifmt-for-zos'
2014-12-22  Junio C HamanoMerge branch 'ps/new-workdir-into-empty-directory'
2014-12-22  Junio C HamanoMerge branch 'nd/ls-tree-pathspec'
2014-12-22  Junio C HamanoMerge branch 'jc/hook-cleanup'
2014-12-22  Junio C HamanoMerge branch 'rt/for-each-ref-spell-tcl-as-Tcl'
2014-12-22  Junio C HamanoMerge branch 'rj/t0050-passes'
2014-12-22  Junio C HamanoMerge branch 'js/push-to-deploy'
2014-12-22  Junio C HamanoMerge branch 'jc/exec-cmd-system-path-leak-fix'
2014-12-22  Junio C HamanoMerge branch 'mh/find-uniq-abbrev'
2014-12-22  Junio C HamanoMerge branch 'pb/send-email-te'
2014-12-22  Junio C HamanoMerge branch 'pb/am-message-id-footer'
2014-12-22  Junio C HamanoMerge branch 'mh/simplify-repack-without-refs'
2014-12-22  Junio C HamanoMerge branch 'dw/shell-basename-dashdash-before-strippi...
2014-12-22  Junio C HamanoMerge branch 'rj/no-xopen-source-for-cygwin'
2014-12-22  Junio C HamanoMerge branch 'js/t5000-dont-copy-bin-sh'
2014-12-22  Junio C HamanoMerge branch 'jc/refer-to-t-readme-from-submitting...
2014-12-22  Junio C HamanoMerge branch 'tb/config-core-filemode-check-on-broken-fs'
2014-12-22  Junio C HamanoMerge branch 'mg/add-ignore-errors'
2014-12-22  Junio C HamanoMerge branch 'jk/lock-ref-sha1-basic-return-errors'
2014-12-22  Junio C HamanoMerge branch 'cc/interpret-trailers-more'
2014-12-18  Junio C HamanoSync with v2.2.1
2014-12-12  Junio C HamanoMerge branch 'jk/pack-bitmap'
2014-12-12  Junio C HamanoMerge branch 'jk/push-simple'
2014-12-12  Junio C HamanoMerge branch 'da/difftool-mergetool-simplify-reporting...
2014-11-21  David Aguilarmergetools: stop setting $status in merge_cmd()
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-06-25  Junio C HamanoMerge branch 'rr/rebase-autostash-fix' into maint
2014-06-16  Junio C HamanoMerge branch 'rr/rebase-autostash-fix'
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-04-09  Junio C HamanoMerge commit 'doc/http-backend: missing accent grave...
2014-03-31  Junio C HamanoMerge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint
2014-03-18  Junio C HamanoMerge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree'
2014-03-07  Junio C HamanoMerge branch 'jc/core-checkstat-2.0'
2014-03-07  Junio C HamanoMerge branch 'jc/add-2.0-ignore-removal'
2014-03-07  Junio C HamanoMerge branch 'jn/add-2.0-u-A-sans-pathspec'
2014-03-07  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple'
2014-02-27  Junio C HamanoMerge branch 'bs/stdio-undef-before-redef'
2014-02-27  Junio C HamanoMerge branch 'jk/config-path-include-fix'
2014-02-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2014-01-27  Junio C HamanoMerge branch 'jc/revision-range-unpeel'
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...
2014-01-13  Junio C HamanoMerge branch 'jk/t5531-prepare-to-default-to-non-matching'
2013-12-17  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix' 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-12-05  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix'
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
2013-11-07  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects'
2013-11-04  Junio C HamanoMerge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc'
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon'
2013-10-30  Junio C HamanoMerge branch 'sg/t3600-nul-sha1-fix'
2013-10-28  Junio C HamanoMerge branch 'ew/keepalive'
2013-10-28  Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2013-10-28  Junio C HamanoMerge branch 'jk/diff-algo' into maint
2013-10-23  Junio C HamanoMerge branch 'jh/checkout-auto-tracking' into maint
2013-10-23  Junio C HamanoMerge branch 'mg/more-textconv'
2013-10-23  Junio C HamanoMerge branch 'jc/pack-objects'
2013-10-17  Junio C HamanoMerge branch 'jc/cvsserver-perm-bit-fix' into maint
2013-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang'
2013-10-14  Jonathan NiederMerge branch 'nv/doc-config-signingkey'
2013-10-14  Jonathan NiederMerge branch 'nd/clone-local-with-colon'
2013-10-14  Jonathan NiederMerge branch 'jk/diff-algo'
2013-10-08  Jonathan NiederMerge branch 'tz/credential-netrc'
2013-09-26  Jonathan NiederMerge branch 'mm/rebase-continue-freebsd-WB' into maint
2013-09-26  Jonathan NiederMerge branch 'js/xread-in-full' into maint
2013-09-20  Junio C HamanoMerge branch 'mm/rebase-continue-freebsd-WB'
2013-09-20  Junio C HamanoMerge branch 'jh/checkout-auto-tracking'
2013-09-18  Junio C HamanoMerge branch 'jc/cvsserver-perm-bit-fix'
2013-09-12  Junio C HamanoMerge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-11  Junio C HamanoMerge branch 'js/xread-in-full'
2013-09-04  Junio C HamanoMerge branch 'tr/fd-gotcha-fixes'
next