git.oblomov.eu Git - git/history - t/t7609-merge-co-error-msgs.sh

[git] / t / t7609-merge-co-error-msgs.sh

2016-09-09	Junio C Hamano	Merge branch 'hv/doc-commit-reference-style' into maint	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'sg/reflog-past-root' into maint	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'rs/mailinfo-lib' into maint	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'jk/tighten-alloc' into maint	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'rs/use-strbuf-add-unique-abbrev' into...	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'rs/merge-recursive-string-list-init'...	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'rs/merge-add-strategies-simplification...	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'ls/packet-line-protocol-doc-fix' into...	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'dg/document-git-c-in-git-config-doc'...	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'js/no-html-bypass-on-windows' into maint	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'js/mv-dir-to-new-directory' into maint	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'js/import-tars-hardlinks' into maint	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'jk/push-force-with-lease-creation' into...	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'jk/reflog-date' into maint	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'jc/renormalize-merge-kill-safer-crlf...	blob \| commitdiff \| raw
2016-09-09	Junio C Hamano	Merge branch 'jk/common-main' into maint	blob \| commitdiff \| raw
2016-08-12	Junio C Hamano	Merge branch 'jk/difftool-in-subdir' into maint	blob \| commitdiff \| raw
2016-08-12	Junio C Hamano	Merge branch 'jk/reset-ident-time-per-commit' into...	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'jh/clean-smudge-f-doc' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'rs/use-strbuf-addstr' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'cp/completion-clone-recurse-submodules...	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'jk/t4205-cleanup' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'jc/hashmap-doc-init' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'js/nedmalloc-gcc6-warnings' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'nd/fbsd-lazy-mtime' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'ab/gitweb-link-html-escape' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'js/t4130-rename-without-ino' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'jc/grep-commandline-vs-configuration...	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning...	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'pm/build-persistent-https-with-recent...	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'da/subtree-2.9-regression' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'os/no-verify-skips-commit-msg-too' into...	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'rs/rm-strbuf-optim' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'jk/parse-options-concat' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'ls/travis-enable-httpd-tests' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'ew/autoconf-pthread' into maint	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'rs/help-c-source-with-gitattributes'...	blob \| commitdiff \| raw
2016-08-10	Junio C Hamano	Merge branch 'mm/status-suggest-merge-abort' into maint	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'sb/pack-protocol-doc-nak' into maint	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'rs/submodule-config-code-cleanup' into...	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'sb/submodule-deinit-all' into maint	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'rs/worktree-use-strbuf-absolute-path...	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'jc/doc-diff-filter-exclude' into maint	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'nd/test-helpers' into maint	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'rs/use-strbuf-addbuf' into maint	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'lf/recv-sideband-cleanup' into maint	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'ah/unpack-trees-advice-messages' into...	blob \| commitdiff \| raw
2016-08-08	Junio C Hamano	Merge branch 'ew/daemon-socket-keepalive' into maint	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'js/ignore-space-at-eol' into maint	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'jk/push-scrub-url' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'nd/icase' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'sb/submodule-parallel-fetch' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'js/t3404-grammo-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'nd/doc-new-command' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'ew/gc-auto-pack-limit-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'js/color-on-windows-comment' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'js/sign-empty-commit-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'ps/rebase-i-auto-unstash-upon-abort'...	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'nd/ita-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'js/find-commit-subject-ignore-leading...	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'dg/subtree-rebase-test' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-15	Junio C Hamano	Merge branch 'jk/tzoffset-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'cb/t7810-test-label-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'sb/t5614-modernize' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'ao/p4-has-branch-prefix-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'ak/t7800-wo-readlink' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jk/tzoffset-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'lc/shell-default-value-noexpand' into...	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'sb/clone-shallow-passthru' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jk/bisect-show-tree' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jc/deref-tag' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'pb/strbuf-read-file-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/fetch-prune-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'mg/cherry-pick-multi-on-unborn' into...	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'em/newer-freebsd-shells-are-fine-with...	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'nb/gnome-keyring-build' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/avoid-unbounded-alloca' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'vs/prompt-avoid-unset-variable' into...	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'dn/gpg-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'ap/git-svn-propset-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'rs/xdiff-hunk-with-func-line' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'jk/rev-list-count-with-bitmap' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'et/pretty-format-c-auto' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'ew/daemon-socket-keepalive' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-27	Alex Henrie	unpack-trees: fix English grammar in do-this-before...	blob \| commitdiff \| raw
2016-06-10	Junio C Hamano	Merge branch 'jk/diff-compact-heuristic'	blob \| commitdiff \| raw \| diff to current
2016-06-06	Junio C Hamano	Merge branch 'kb/msys2-tty' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-06	Junio C Hamano	Merge branch 'da/difftool' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-06	Junio C Hamano	Merge branch 'tb/core-eol-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-06	Junio C Hamano	Merge branch 'ar/diff-args-osx-precompose' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'rs/apply-name-terminate'	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'rs/patch-id-use-skip-prefix'	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'pa/cherry-pick-doc-typo'	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'js/rebase-i-dedup-call-to-rerere'	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'js/perf-rebase-i'	blob \| commitdiff \| raw \| diff to current
2016-05-31	Junio C Hamano	Merge branch 'sb/submodule-deinit-all' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-31	Junio C Hamano	Merge branch 'bn/http-cookiefile-config' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-31	Junio C Hamano	Merge branch 'jk/test-send-sh-x-trace-elsewhere' into...	blob \| commitdiff \| raw \| diff to current
2016-05-31	Junio C Hamano	Merge branch 'js/name-rev-use-oldest-ref' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-31	Junio C Hamano	Merge branch 'es/t1500-modernize'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom