merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / t / t6006-rev-list-format.sh
2016-10-03 Merge branch 'va/git-gui-i18n'
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 'ik/gitweb-force-highlight'
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-09-30 pretty: avoid adding reset for %C(auto) if output is...
2016-09-29 Sync with maint
2016-09-29 Merge branch 'jc/worktree-config'
2016-09-29 Merge branch 'jk/ident-ai-canonname-could-be-null'
2016-09-29 Merge branch 'jt/fetch-pack-in-vain-count-with-stateless'
2016-09-29 Merge branch 'jk/verify-packfile-gently'
2016-09-29 Merge branch 'jt/mailinfo-fold-in-body-headers'
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 'ew/http-do-not-forget-to-call-curl-multi...
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/clone-recursive-progress'
2016-09-26 Merge branch 'jk/doc-cvs-update'
2016-09-26 Merge branch 'rt/rebase-i-broken-insn-advise'
2016-09-26 Merge branch 'rs/checkout-init-macro'
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 'nd/checkout-disambiguation'
2016-09-26 Merge branch 'va/i18n-more'
2016-09-26 Merge branch 'jt/format-patch-rfc'
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 'mr/vcs-svn-printf-ulong'
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 'et/add-chmod-x'
2016-09-19 Merge branch 'po/range-doc' into maint
2016-09-19 Merge branch 'mh/ref-store'
2016-09-19 pretty: let %C(auto) reset all attributes
2016-09-15 Merge branch 'jk/fix-remote-curl-url-wo-proto'
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 'po/range-doc'
2016-09-09 Merge branch 'jk/format-patch-number-singleton-patch...
2016-09-09 Merge branch 'hv/doc-commit-reference-style' into maint
2016-09-09 Merge branch 'sg/reflog-past-root' into maint
2016-09-09 Merge branch 'rs/mailinfo-lib' into maint
2016-09-09 Merge branch 'jk/tighten-alloc' into maint
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-09 Merge branch 'dg/document-git-c-in-git-config-doc'...
2016-09-09 Merge branch 'js/no-html-bypass-on-windows' into maint
2016-09-09 Merge branch 'js/import-tars-hardlinks' into maint
2016-09-09 Merge branch 'jk/push-force-with-lease-creation' into...
2016-09-09 Merge branch 'jc/renormalize-merge-kill-safer-crlf...
2016-09-09 Merge branch 'jk/common-main' into maint
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-26 Merge branch 'js/no-html-bypass-on-windows' into rt...
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 'tb/t0027-raciness-fix'
2016-08-17 Merge branch 'sg/reflog-past-root'
2016-08-17 Merge branch 'rs/mailinfo-lib'
2016-08-17 Merge branch 'jk/tighten-alloc'
2016-08-16 Merge branch 'lt/gpg-show-long-key-in-signature-verific...
2016-08-12 Merge branch 'kw/patch-ids-optim'
2016-08-12 Merge branch 'jk/big-and-future-archive-tar'
2016-08-12 Merge branch 'js/import-tars-hardlinks'
2016-08-12 Merge branch 'jk/difftool-in-subdir' into maint
2016-08-12 Merge branch 'jk/reset-ident-time-per-commit' into...
2016-08-10 Merge branch 'js/commit-slab-decl-fix'
2016-08-10 Merge branch 'jk/push-force-with-lease-creation'
2016-08-10 Merge branch 'jk/reset-ident-time-per-commit'
2016-08-10 Merge branch 'cp/completion-clone-recurse-submodules...
2016-08-10 Merge branch 'jc/hashmap-doc-init' into maint
2016-08-10 Merge branch 'ab/gitweb-link-html-escape' into maint
2016-08-10 Merge branch 'js/t4130-rename-without-ino' into maint
2016-08-10 Merge branch 'jc/grep-commandline-vs-configuration...
2016-08-10 Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning...
2016-08-10 Merge branch 'pm/build-persistent-https-with-recent...
next