Merge branch 'sb/submodule-fetch-nontip'
[git] / t / t7610-mergetool.sh
2016-02-26  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test'
2016-02-26  Junio C HamanoMerge branch 'mm/push-simple-doc'
2016-02-26  Junio C HamanoMerge branch 'mg/work-tree-tests'
2016-02-26  Junio C HamanoMerge branch 'jk/more-comments-on-textconv'
2016-02-26  Junio C HamanoMerge branch 'jk/no-diff-emit-common'
2016-02-26  Junio C HamanoMerge branch 'ak/git-strip-extension-from-dashed-command'
2016-02-26  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep'
2016-02-24  Junio C HamanoMerge branch 'jc/am-i-v-fix'
2016-02-24  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs'
2016-02-22  Junio C HamanoMerge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2016-02-22  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-02-17  Junio C HamanoMerge branch 'jk/rerere-xsnprintf'
2016-02-17  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-02-10  Junio C HamanoMerge branch 'wp/sha1-name-negative-match'
2016-02-05  Junio C HamanoMerge branch 'lv/add-doc-working-tree' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/clone-depth-single-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05  Junio C HamanoMerge branch 'ew/for-each-ref-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/user-manual' into maint
2016-02-05  Junio C HamanoMerge branch 'tb/complete-word-diff-regex' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/sanity' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/ok-to-fail-gc-auto-in-rebase' into...
2016-02-05  Junio C HamanoMerge branch 'ho/gitweb-squelch-undef-warning' into...
2016-02-05  Junio C HamanoMerge branch 'nd/exclusion-regression-fix' into maint
2016-02-05  Junio C HamanoMerge branch 'ew/send-email-mutt-alias-fix' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/dir-exclude-cleanup' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into maint
2016-02-03  Junio C HamanoMerge branch 'lv/add-doc-working-tree'
2016-02-03  Junio C HamanoMerge branch 'tb/complete-word-diff-regex'
2016-01-29  Junio C HamanoMerge branch 'jk/sanity'
2016-01-26  Junio C HamanoMerge branch 'jk/ok-to-fail-gc-auto-in-rebase'
2016-01-22  Junio C HamanoMerge branch 'rm/subtree-unwrap-tags'
2016-01-20  Junio C HamanoMerge branch 'tg/grep-no-index-fallback'
2016-01-20  Junio C HamanoMerge branch 'ho/gitweb-squelch-undef-warning'
2016-01-20  Junio C HamanoMerge branch 'ss/clone-depth-single-doc'
2016-01-20  Junio C HamanoMerge branch 'nd/exclusion-regression-fix'
2016-01-20  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix'
2016-01-20  Junio C HamanoMerge branch 'ew/for-each-ref-doc'
2016-01-20  Junio C HamanoMerge branch 'ew/send-email-mutt-alias-fix'
2016-01-20  Junio C HamanoMerge branch 'ss/user-manual'
2016-01-20  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-01-20  Junio C HamanoMerge branch 'nd/ita-cleanup'
2016-01-20  Junio C HamanoMerge branch 'nd/dir-exclude-cleanup'
2016-01-20  Junio C HamanoMerge branch 'jk/pack-revindex'
2016-01-12  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree'
2016-01-04  Junio C HamanoMerge branch 'jk/pending-keep-tag-name' into maint
2016-01-04  Junio C HamanoMerge branch 'jk/symbolic-ref-maint' into maint
2016-01-04  Junio C HamanoMerge branch 'jk/ident-loosen-getpwuid' into maint
2016-01-04  Junio C HamanoMerge branch 'jk/send-email-ssl-errors' into maint
2016-01-04  Junio C HamanoMerge branch 'sg/completion-no-column' into maint
2015-12-28  Junio C HamanoMerge branch 'jk/pending-keep-tag-name'
2015-12-28  Junio C HamanoMerge branch 'jk/symbolic-ref-maint'
2015-12-22  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into nd/clear...
2015-12-21  Junio C HamanoMerge branch 'jk/ident-loosen-getpwuid'
2015-12-21  Junio C HamanoMerge branch 'jk/send-email-ssl-errors'
2015-12-21  Junio C HamanoMerge branch 'sg/completion-no-column'
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-12-16  Junio C HamanoMerge branch 'sg/lock-file-commit-error' into maint
2015-12-15  Junio C HamanoMerge branch 'dt/fsck-verify-pack-error' into maint
2015-12-15  Junio C HamanoMerge branch 'ep/ident-with-getaddrinfo' into maint
2015-12-15  Junio C HamanoMerge branch 'ls/p4-keep-empty-commits' into maint
2015-12-15  Junio C HamanoMerge branch 'ep/ident-with-getaddrinfo'
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime' into maint
2015-12-15  Junio C HamanoMerge branch 'ls/p4-keep-empty-commits'
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime'
2015-12-11  Junio C HamanoMerge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
2015-12-11  Junio C HamanoMerge branch 'sg/lock-file-commit-error' into maint
2015-12-11  Junio C HamanoMerge branch 'cb/t3404-shellquote' into maint
2015-12-11  Junio C HamanoMerge branch 'sb/doc-submodule-sync-recursive' into...
2015-12-11  Junio C HamanoMerge branch 'nd/doc-check-ref-format-typo' into maint
2015-12-11  Junio C HamanoMerge branch 'rs/show-branch-argv-array' into maint
2015-12-11  Junio C HamanoMerge branch 'rs/pop-commit' into maint
2015-12-11  Junio C HamanoMerge branch 'as/subtree-with-spaces' into maint
2015-12-11  Junio C HamanoMerge branch 'jk/test-lint-forbid-when-finished-in...
2015-12-11  Junio C HamanoMerge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
2015-12-11  Junio C HamanoMerge branch 'sb/doc-submodule-sync-recursive'
2015-12-11  Junio C HamanoMerge branch 'cb/t3404-shellquote'
2015-12-11  Junio C HamanoMerge branch 'sg/lock-file-commit-error'
2015-12-10  Junio C HamanoSync with maint
2015-12-10  Junio C HamanoMerge branch 'nd/doc-check-ref-format-typo'
2015-12-10  Junio C HamanoMerge branch 'dt/fsck-verify-pack-error'
2015-12-08  Junio C HamanoMerge branch 'ep/ident-with-getaddrinfo'
2015-12-08  Junio C HamanoSync with 2.6.4
2015-12-04  Junio C HamanoSync with maint
2015-12-04  Junio C HamanoMerge branch 'sg/bash-prompt-dirty-orphan'
2015-12-04  Junio C HamanoMerge branch 'ad/sha1-update-chunked'
2015-12-01  Jeff KingMerge branch 'mk/blame-first-parent'
2015-12-01  Jeff KingMerge branch 'maint'
2015-12-01  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25  Jeff KingMerge branch 'fp/subtree-todo-update'
2015-11-25  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25  Jeff KingMerge branch 'maint'
2015-11-20  Jeff KingMerge branch 'dk/gc-idx-wo-pack'
2015-11-05  Junio C HamanoMerge branch 'ea/checkout-progress'
2015-11-05  Junio C HamanoSync with 2.6.3
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top' into maint
2015-11-04  Junio C HamanoSync with maint
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-ff' into maint
next