merge: detect delete/modechange conflict
[gitweb.git] / t / t5561-http-backend.sh
2014-03-18 Merge branch 'jk/clean-d-pathspec' into maint
2014-03-18 Merge branch 'da/difftool-git-files' into maint
2014-03-18 Merge branch 'jk/remote-pushremote-config-reading'...
2014-03-18 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18 Merge branch 'tr/diff-submodule-no-reuse-worktree'...
2014-03-18 Merge branch 'nd/reset-setup-worktree' into maint
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Merge branch 'bk/refresh-missing-ok-in-merge-recursive...
2014-03-18 Merge branch 'ds/rev-parse-required-args' into maint
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-03-18 Merge branch 'nd/diff-quiet-stat-dirty' into maint
2014-03-18 Merge branch 'nd/http-fetch-shallow-fix' into maint
2014-03-18 Merge branch 'rs/grep-h-c'
2014-03-18 Merge branch 'rm/strchrnul-not-strlen'
2014-03-18 Merge branch 'jc/tag-contains-with'
2014-03-18 Merge branch 'bg/install-branch-config-skip-prefix'
2014-03-18 Merge branch 'jc/no-need-for-env-in-sh-scripts'
2014-03-18 Merge branch 'mh/simplify-cache-tree-find'
2014-03-18 Merge branch 'jn/branch-lift-unnecessary-name-length...
2014-03-18 Merge branch 'jk/doc-deprecate-grafts'
2014-03-18 Merge branch 'jk/detect-push-typo-early'
2014-03-18 Merge branch 'jk/repack-pack-keep-objects'
2014-03-18 Merge branch 'dd/use-alloc-grow'
2014-03-18 Merge branch 'dd/find-graft-with-sha1-pos'
2014-03-18 Merge branch 'fc/transport-helper-fixes'
2014-03-18 Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-18 Merge branch 'jk/diff-filespec-cleanup'
2014-03-18 Merge branch 'jk/clean-d-pathspec'
2014-03-14 Merge branch 'ta/parse-commit-with-skip-prefix'
2014-03-14 Merge branch 'sr/add--interactive-term-readkey'
2014-03-14 Merge branch 'sh/write-pack-file-warning-message-fix'
2014-03-14 Merge branch 'nd/strbuf-inline-styles'
2014-03-14 Merge branch 'jn/bisect-coding-style'
2014-03-14 Merge branch 'mh/replace-refs-variable-rename'
2014-03-14 Merge branch 'sg/archive-restrict-remote'
2014-03-14 Merge branch 'rt/help-pretty-prints-cmd-names'
2014-03-14 Merge branch 'jl/doc-submodule-update-checkout'
2014-03-14 Merge branch 'jk/doc-coding-guideline'
2014-03-14 Merge branch 'da/difftool-git-files'
2014-03-14 Merge branch 'tg/index-v4-format'
2014-03-14 Merge branch 'nd/i18n-progress'
2014-03-14 Merge branch 'mh/object-code-cleanup'
2014-03-14 Merge branch 'jn/am-doc-hooks'
2014-03-14 Merge branch 'jm/stash-doc-k-for-keep'
2014-03-14 Merge branch 'jk/remote-pushremote-config-reading'
2014-03-14 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-14 Merge branch 'jh/note-trees-record-blobs'
2014-03-14 Merge branch 'rt/links-for-asciidoctor'
2014-03-14 Merge branch 'nd/no-more-fnmatch'
2014-03-14 Merge branch 'ak/gitweb-fit-image'
2014-03-14 Merge branch 'tr/diff-submodule-no-reuse-worktree'
2014-03-14 Merge branch 'nd/reset-setup-worktree'
2014-03-14 Merge branch 'lb/contrib-contacts-looser-diff-parsing'
2014-03-14 Merge branch 'ks/config-file-stdin'
2014-03-14 Merge branch 'jk/janitorial-fixes'
2014-03-14 Merge branch 'jk/http-no-curl-easy'
2014-03-14 Merge branch 'ss/completion-rec-sub-fetch-push'
2014-03-14 Merge branch 'nd/gitignore-trailing-whitespace'
2014-03-14 Merge branch 'jc/check-attr-honor-working-tree'
2014-03-07 Merge branch 'cc/starts-n-ends-with-endgame'
2014-03-07 Merge branch 'jc/hold-diff-remove-q-synonym-for-no...
2014-03-07 Merge branch 'gj/push-more-verbose-advice'
2014-03-07 Merge branch 'jc/core-checkstat-2.0'
2014-03-07 Merge branch 'jc/add-2.0-ignore-removal'
2014-03-07 Merge branch 'jn/add-2.0-u-A-sans-pathspec'
2014-03-07 Merge branch 'jc/push-2.0-default-to-simple'
2014-03-05 Merge branch 'maint'
2014-03-05 Merge branch 'jk/run-network-tests-by-default'
2014-03-05 Merge branch 'nd/daemonize-gc'
2014-03-05 Merge branch 'ks/combine-diff'
2014-03-03 Merge branch 'sh/write-pack-file-warning-message-fix...
2014-02-27 Merge branch 'jk/pack-bitmap'
2014-02-27 Merge branch 'dk/blame-janitorial'
2014-02-27 Merge branch 'bc/gpg-sign-everywhere'
2014-02-27 Merge branch 'al/docs'
2014-02-27 Merge branch 'jk/test-ports'
2014-02-10 tests: auto-set LIB_HTTPD_PORT from test name
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
2013-11-04 Merge branch 'vd/doc-unpack-objects'
2013-10-30 Merge branch 'jk/refs-c-squelch-gcc'
2013-10-30 Merge branch 'jk/date-c-double-semicolon'
2013-10-14 Merge branch 'rj/highlight-test-hang'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-02-04 Merge branch 'dl/am-hg-locale' into maint
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-28 Merge branch 'dl/am-hg-locale'
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2013-01-14 Merge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
2013-01-10 Merge branch 'ta/remove-stale-translated-tut' into...
2013-01-08 Merge branch 'ta/remove-stale-translated-tut'
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
next