t6042: add tests for consistency in file collision conflict handling
[gitweb.git] / t /
2018-08-15 Merge branch 'cb/p4-pre-submit-hook'
2018-08-15 Merge branch 'js/vscode'
2018-08-15 Merge branch 'bb/redecl-enum-fix'
2018-08-15 Merge branch 'jk/banned-function'
2018-08-15 Merge branch 'en/merge-recursive-skip-fix'
2018-08-15 Merge branch 'jt/tag-following-with-proto-v2-fix'
2018-08-15 Merge branch 'jk/size-t'
2018-08-15 Merge branch 'sg/coccicheck-updates'
2018-08-15 Merge branch 'sb/histogram-less-memory'
2018-08-15 Merge branch 'nd/i18n'
2018-08-15 Merge branch 'hs/gpgsm'
2018-08-15 Merge branch 'bw/clone-ref-prefixes'
2018-08-15 Merge branch 'jk/core-use-replace-refs'
2018-08-15 Merge branch 'jh/json-writer'
2018-08-15 Merge branch 'bb/make-developer-pedantic'
2018-08-15 Merge branch 'es/diff-color-moved-fix'
2018-08-15 Merge branch 'bw/protocol-v2'
2018-08-15 Merge branch 'sg/travis-cocci-diagnose-failure'
2018-08-15 Merge branch 'js/t7406-recursive-submodule-update-order...
2018-08-15 Merge branch 'bw/fetch-pack-i18n'
2018-08-15 Merge branch 'sg/fast-import-dump-refs-on-checkpoint...
2018-08-15 Merge branch 'sb/trailers-docfix'
2018-08-15 Merge branch 'jk/ui-color-always-to-auto'
2018-08-15 rebase -i: fix numbering in squash message
2018-08-15 chainlint: fix for core.autocrlf=true
2018-08-14 format-patch: extend --range-diff to accept revision...
2018-08-14 format-patch: add --range-diff option to embed diff...
2018-08-14 Merge branch 'es/format-patch-interdiff' into es/format...
2018-08-14 Merge branch 'js/range-diff' into es/format-patch-rangediff
2018-08-14 diff: use emit_line_0 once per line
2018-08-14 t3206: add color test for range-diff --dual-color
2018-08-14 test_decode_color: understand FAINT and ITALIC
2018-08-14 submodule: add more exhaustive up-path testing
2018-08-14 t5310-pack-bitmaps: fix bogus 'pack-objects to file...
2018-08-13 cat-file: support "unordered" output for --batch-all...
2018-08-13 t1006: test cat-file --batch-all-objects with duplicates
2018-08-13 fetch tests: correct a comment "remove it" -> "remove...
2018-08-13 chainlint: add test of pathological case which triggere...
2018-08-13 chainlint: recognize multi-line quoted strings more...
2018-08-13 chainlint: let here-doc and multi-line string commence...
2018-08-13 chainlint: recognize multi-line $(...) when command...
2018-08-13 chainlint: match 'quoted' here-doc tags
2018-08-13 chainlint: match arbitrary here-docs tags rather than...
2018-08-13 t5318: avoid unnecessary command substitutions
2018-08-13 t5318: use 'test_cmp_bin' to compare commit-graph files
2018-08-13 range-diff: add tests
2018-08-10 t5552: suppress upload-pack trace output
2018-08-09 repack: repack promisor objects if -a or -A is set
2018-08-09 rebase --exec: make it work with --rebase-merges
2018-08-08 sideband: highlight keywords in remote sideband output
2018-08-08 config: fix case sensitive subsection names on writing
2018-08-08 t7406: avoid using test_must_fail for commands other...
2018-08-08 t7406: prefer test_* helper functions to test -[feds]
2018-08-08 t7406: avoid having git commands upstream of a pipe
2018-08-08 t7406: simplify by using diff --name-only instead of...
2018-08-08 t7406: fix call that was failing for the wrong reason
2018-08-07 sequencer: fix quoting in write_author_script
2018-08-06 t: factor out FUNNYNAMES as shared lazy prereq
2018-08-06 rerere: recalculate conflict ID when unresolved conflic...
2018-08-06 rerere: teach rerere to handle nested conflicts
2018-08-06 rerere: fix crash with files rerere can't handle
2018-08-06 t3430: demonstrate what -r, --autosquash & --exec should do
2018-08-06 t4150: fix broken test for am --scissors
2018-08-06 pull --rebase=<type>: allow single-letter abbreviations...
2018-08-06 t3031: update test description to mention desired behavior
2018-08-02 Merge branch 'jt/commit-graph-per-object-store'
2018-08-02 Merge branch 'es/chain-lint-in-subshell'
2018-08-02 Merge branch 'jt/tags-to-promised-blobs-fix'
2018-08-02 Merge branch 'jt/fetch-negotiator-skipping'
2018-08-02 Merge branch 'jm/send-email-tls-auth-on-batch'
2018-08-02 Merge branch 'bc/sequencer-export-work-tree-as-well'
2018-08-02 Merge branch 'en/t7405-recursive-submodule-conflicts'
2018-08-02 Merge branch 'en/t6036-merge-recursive-tests'
2018-08-02 Merge branch 'en/dirty-merge-fixes'
2018-08-02 Merge branch 'js/rebase-merge-octopus'
2018-08-02 Merge branch 'tb/grep-only-matching'
2018-08-02 Merge branch 'kg/gc-auto-windows-workaround'
2018-08-02 Merge branch 'jm/cache-entry-from-mem-pool'
2018-08-02 Merge branch 'jt/fetch-nego-tip'
2018-08-02 Merge branch 'en/t6042-insane-merge-rename-testcases'
2018-08-02 Merge branch 'sb/object-store-lookup'
2018-08-02 Merge branch 'is/parsing-line-range'
2018-08-02 Merge branch 'jt/fetch-pack-negotiator'
2018-08-02 Merge branch 'ab/checkout-default-remote'
2018-08-02 Merge branch 'sb/diff-color-move-more'
2018-08-02 Merge branch 'es/test-fixes'
2018-08-02 Merge branch 'ds/commit-graph-fsck'
2018-08-02 Merge branch 'jk/fsck-gitmodules-gently'
2018-08-02 Merge branch 'bc/object-id'
2018-08-02 Merge branch 'en/t6036-recursive-corner-cases'
2018-08-02 Merge branch 'sg/httpd-test-unflake'
2018-08-02 Merge branch 'bp/test-drop-caches-for-windows'
2018-08-02 Merge branch 'jk/has-uncommitted-changes-fix'
2018-08-02 score_trees(): fix iteration over trees with missing...
2018-08-02 remote: make refspec follow the same disambiguation...
2018-08-01 fetch-pack: unify ref in and out param
2018-08-01 git-p4: add the `p4-pre-submit` hook
2018-08-01 t1300: document current behavior of setting options
2018-08-01 negotiator: unknown fetch.negotiationAlgorithm should...
2018-08-01 Merge branch 'jt/fetch-nego-tip' into ab/fetch-nego
next