merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / t / t1006-cat-file.sh
2016-10-10 Merge branch 'nd/shallow-deepen'
2016-10-10 Merge branch 'cp/completion-negative-refs'
2016-10-10 Merge branch 'dp/autoconf-curl-ssl'
2016-10-10 Merge branch 'ak/curl-imap-send-explicit-scheme'
2016-10-10 Merge branch 'jk/pack-objects-optim-mru'
2016-10-06 Merge branch 'rs/c-auto-resets-attributes'
2016-10-06 Merge branch 'jk/graph-padding-fix'
2016-10-03 Merge branch 'pb/rev-list-reverse-with-count'
2016-10-03 Merge branch 'mh/diff-indent-heuristic'
2016-10-03 Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
2016-10-03 Merge branch 'jc/verify-loose-object-header'
2016-10-03 Merge branch 'nd/init-core-worktree-in-multi-worktree...
2016-10-03 Merge branch 'rs/copy-array'
2016-10-03 Merge branch 'jk/ident-ai-canonname-could-be-null'...
2016-10-03 Merge branch 'jk/doc-cvs-update' into maint
2016-10-03 Merge branch 'jk/pack-tag-of-tag' into maint
2016-09-29 Merge branch 'jk/ident-ai-canonname-could-be-null'
2016-09-29 Merge branch 'jk/verify-packfile-gently'
2016-09-29 Merge branch 'tg/add-chmod+x-fix' into maint
2016-09-29 Merge branch 'et/add-chmod-x' into maint
2016-09-29 Merge branch 'ls/travis-homebrew-path-fix' into maint
2016-09-29 Merge branch 'js/regexec-buf' into maint
2016-09-29 Merge branch 'ep/doc-check-ref-format-example' into...
2016-09-29 Merge branch 'mm/config-color-ui-default-to-auto' into...
2016-09-29 Merge branch 'jk/reduce-gc-aggressive-depth' into maint
2016-09-29 Merge branch 'jk/rebase-i-drop-ident-check' into maint
2016-09-29 Merge branch 'rs/xdiff-merge-overlapping-hunks-for...
2016-09-29 Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
2016-09-29 Merge branch 'js/git-gui-commit-gpgsign' into maint
2016-09-29 Merge branch 'jk/fix-remote-curl-url-wo-proto' into...
2016-09-29 Merge branch 'mr/vcs-svn-printf-ulong' into maint
2016-09-29 Merge branch 'rs/strbuf-remove-fix' into maint
2016-09-29 Merge branch 'rs/checkout-some-states-are-const' into...
2016-09-29 Merge branch 'bw/pathspec-remove-unused-extern-decl...
2016-09-26 Merge branch 'jk/doc-cvs-update'
2016-09-26 Merge branch 'ls/travis-homebrew-path-fix'
2016-09-26 Merge branch 'tg/add-chmod+x-fix'
2016-09-26 Merge branch 'js/regexec-buf'
2016-09-26 Merge branch 'ep/doc-check-ref-format-example'
2016-09-26 Merge branch 'mh/diff-indent-heuristic'
2016-09-26 Merge branch 'rs/c-auto-resets-attributes'
2016-09-26 Merge branch 'mm/config-color-ui-default-to-auto'
2016-09-26 Merge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26 Merge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-21 Merge branch 'jk/reduce-gc-aggressive-depth'
2016-09-21 Merge branch 'jk/rebase-i-drop-ident-check'
2016-09-21 Merge branch 'mr/vcs-svn-printf-ulong'
2016-09-21 Merge branch 'rs/xdiff-merge-overlapping-hunks-for...
2016-09-21 Merge branch 'rs/strbuf-remove-fix'
2016-09-21 Merge branch 'rs/checkout-some-states-are-const'
2016-09-21 Merge branch 'jk/setup-sequence-update'
2016-09-21 Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
2016-09-21 Merge branch 'bw/pathspec-remove-unused-extern-decl'
2016-09-21 Merge branch 'ks/pack-objects-bitmap'
2016-09-21 Merge branch 'et/add-chmod-x'
2016-09-21 Merge branch 'jt/accept-capability-advertisement-when...
2016-09-19 Merge branch 'sb/xdiff-remove-unused-static-decl' into...
2016-09-19 Merge branch 'js/t9903-chaining' into maint
2016-09-19 Merge branch 'rs/hex2chr' into maint
2016-09-19 Merge branch 'rs/compat-strdup' into maint
2016-09-19 Merge branch 'jk/squelch-false-warning-from-gcc-o3...
2016-09-19 Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint
2016-09-19 Merge branch 'jc/submodule-anchor-git-dir' into maint
2016-09-19 Merge branch 'jk/test-lib-drop-pid-from-results' into...
2016-09-19 Merge branch 'po/range-doc' into maint
2016-09-19 Merge branch 'mh/ref-store'
2016-09-19 Merge branch 'cc/apply-am'
2016-09-15 Merge branch 'js/git-gui-commit-gpgsign'
2016-09-15 Merge branch 'jk/fix-remote-curl-url-wo-proto'
2016-09-15 Merge branch 'jk/pack-tag-of-tag'
2016-09-12 Merge branch 'sb/xdiff-remove-unused-static-decl'
2016-09-12 Merge branch 'js/t9903-chaining'
2016-09-12 Merge branch 'rs/hex2chr'
2016-09-12 Merge branch 'rs/compat-strdup'
2016-09-12 Merge branch 'jc/forbid-symbolic-ref-d-HEAD'
2016-09-12 Merge branch 'jc/submodule-anchor-git-dir'
2016-09-12 Merge branch 'jk/squelch-false-warning-from-gcc-o3'
2016-09-12 Merge branch 'jk/test-lib-drop-pid-from-results'
2016-09-12 Merge branch 'jk/diff-submodule-diff-inline'
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'hv/doc-commit-reference-style'
2016-09-09 Merge branch 'sb/submodule-clone-rr'
2016-09-09 Merge branch 'jh/status-v2-porcelain'
2016-09-09 Merge branch 'po/range-doc'
2016-09-09 Merge branch 'rt/help-unknown'
2016-09-09 Merge branch 'jk/format-patch-number-singleton-patch...
2016-09-09 Start maintenance track for 2.10.x series
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-08-31 Merge branch 'mh/blame-worktree'
2016-08-31 Merge branch 'kw/patch-ids-optim'
2016-08-25 Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'
2016-08-25 Merge branch 'dg/document-git-c-in-git-config-doc'
2016-08-25 Merge branch 'js/no-html-bypass-on-windows'
2016-08-25 Merge branch 'hv/doc-commit-reference-style'
2016-08-19 Merge branch 'ab/hooks'
2016-08-19 Merge branch 'jk/difftool-command-not-found'
2016-08-19 Merge branch 'sb/checkout-explit-detach-no-advice'
2016-08-19 Merge branch 'tb/t0027-raciness-fix'
next