projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'ak/t4204-shell-portability'
[git] / t / t7609-merge-co-error-msgs.sh
2016-05-30  Junio C HamanoMerge branch 'rj/log-decorate-auto' blob | commitdiff | raw
2016-05-30  Junio C HamanoMerge branch 'kb/msys2-tty' blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'jc/linkgit-fix' into maint blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'ls/travis-build-doc' into maint blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'jc/fsck-nul-in-commit' into maint blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'jk/rebase-interative-eval-fix' into maint blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'js/windows-dotgit' into maint blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'kf/gpg-sig-verification-doc' into maint blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'lp/typofixes' into maint blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'sb/z-is-gnutar-ism' into maint blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'va/i18n-misc-updates' into maint blob | commitdiff | raw
2016-05-26  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix' into maint blob | commitdiff | raw | diff to current
2016-05-23  Junio C HamanoMerge branch 'jc/rerere-multi' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'da/difftool' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'jk/test-z-n-unquoted' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'ar/diff-args-osx-precompose' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'jc/doc-lint' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'js/perf-rebase-i' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'jc/test-parse-options-expect' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'pb/commit-verbose-config' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'xy/format-patch-base' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'tb/core-eol-fix' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'nd/worktree-various-heads' blob | commitdiff | raw
2016-05-23  Junio C HamanoMerge branch 'ss/commit-dry-run-resolve-merge-to-no-op' blob | commitdiff | raw
2016-05-18  Junio C HamanoSync with 2.8.3 blob | commitdiff | raw
2016-05-18  Junio C HamanoMerge branch 'jk/push-client-deadlock-fix' blob | commitdiff | raw
2016-05-18  Junio C HamanoMerge branch 'rn/glossary-typofix' into HEAD blob | commitdiff | raw | diff to current
2016-05-17  Junio C HamanoMerge branch 'kf/gpg-sig-verification-doc' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'js/windows-dotgit' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'jk/test-send-sh-x-trace-elsewhere' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'js/http-custom-headers' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'jk/rebase-interative-eval-fix' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'jc/fsck-nul-in-commit' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'nd/test-helpers' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'ls/travis-build-doc' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'jc/ll-merge-internal' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'jc/linkgit-fix' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'va/i18n-remote-comment-to-align' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'tb/t5601-sed-fix' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'nd/error-errno' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'jc/test-seq' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'es/test-gpg-tags' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'ak/t4151-ls-files-could-be-empty' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'jk/submodule-c-credential' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'nd/remote-plural-ours-plus-theirs' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'bn/config-doc-tt-varnames' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'va/i18n-misc-updates' blob | commitdiff | raw
2016-05-12  Vasco Almeidai18n: unpack-trees: avoid substituting only a verb... blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix' blob | commitdiff | raw | diff to current
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into... blob | commitdiff | raw | diff to current
2015-10-05  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test' blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix' blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint blob | commitdiff | raw | diff to current
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix' blob | commitdiff | raw | diff to current
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint blob | commitdiff | raw | diff to current
2015-06-01  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' blob | commitdiff | raw | diff to current
2015-05-26  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long' into... blob | commitdiff | raw | diff to current
2015-05-11  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long' blob | commitdiff | raw | diff to current
2015-04-21  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix' into maint blob | commitdiff | raw | diff to current
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui blob | commitdiff | raw | diff to current
2015-04-14  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix' blob | commitdiff | raw | diff to current
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes... blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes... blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot... blob | commitdiff | raw | diff to current
2015-02-17  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot... blob | commitdiff | raw | diff to current
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into... blob | commitdiff | raw | diff to current
2015-01-07  Junio C HamanoMerge branch 'sb/t5400-remove-unused' blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' blob | commitdiff | raw | diff to current
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into... blob | commitdiff | raw | diff to current
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' blob | commitdiff | raw | diff to current
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix' blob | commitdiff | raw | diff to current
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix' blob | commitdiff | raw | diff to current
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git blob | commitdiff | raw | diff to current
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0' blob | commitdiff | raw | diff to current
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui blob | commitdiff | raw | diff to current
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into... blob | commitdiff | raw | diff to current
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint blob | commitdiff | raw | diff to current
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon' blob | commitdiff | raw | diff to current
2013-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang' blob | commitdiff | raw | diff to current
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2013-04-03  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup' into maint... blob | commitdiff | raw | diff to current
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify... blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.