Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'km/test-mailinfo-b-failure' into maint | Junio C Hamano | 2017-06-24 |
|\ | |||
| * | t5100: add some more mailinfo tests | Kyle J. McKay | 2017-06-12 |
* | | Merge branch 'ps/stash-push-pathspec-fix' into maint | Junio C Hamano | 2017-06-24 |
|\ \ | |||
| * | | git-stash: fix pushing stash with pathspec from subdir | Patrick Steinhardt | 2017-06-13 |
* | | | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2017-06-24 |
|\ \ \ | |||
| * | | | t5313: make extended-table test more deterministic | Jeff King | 2017-06-07 |
* | | | | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-06-24 |
|\ \ \ \ | |||
| * | | | | diff: use blob path for blob/file diffs | Jeff King | 2017-05-24 |
| * | | | | diff: use pending "path" if it is available | Jeff King | 2017-05-24 |
| * | | | | handle_revision_arg: record modes for "a..b" endpoints | Jeff King | 2017-05-24 |
| * | | | | t4063: add tests of direct blob diffs | Jeff King | 2017-05-24 |
| * | | | | handle_revision_arg: reset "dotdot" consistently | Jeff King | 2017-05-24 |
* | | | | | Merge branch 'jc/name-rev-lw-tag' into maint | Junio C Hamano | 2017-06-24 |
|\ \ \ \ \ | |||
| * | | | | | name-rev: favor describing with tags and use committer date to tiebreak | Junio C Hamano | 2017-03-29 |
* | | | | | | Merge branch 'ab/t3070-test-dedup' into maint | Junio C Hamano | 2017-06-13 |
|\ \ \ \ \ \ | |||
| * | | | | | | wildmatch test: remove redundant duplicate test | Ævar Arnfjörð Bjarmason | 2017-05-29 |
| | |_|_|_|/ | |/| | | | | |||
* | | | | | | Merge branch 'jh/memihash-opt' into maint | Junio C Hamano | 2017-06-13 |
|\ \ \ \ \ \ | |||
| * | | | | | | p0004: don't error out if test repo is too small | René Scharfe | 2017-05-16 |
| * | | | | | | p0004: don't abort if multi-threaded is too slow | René Scharfe | 2017-05-16 |
| * | | | | | | p0004: use test_perf | René Scharfe | 2017-05-16 |
| * | | | | | | p0004: avoid using pipes | René Scharfe | 2017-05-16 |
| * | | | | | | p0004: simplify calls of test-lazy-init-name-hash | René Scharfe | 2017-05-16 |
* | | | | | | | Merge branch 'tb/pull-ff-rebase-autostash' into maint | Junio C Hamano | 2017-06-13 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | pull: ff --rebase --autostash works in dirty repo | Tyler Brazier | 2017-06-01 |
| | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Merge branch 'sl/clean-d-ignored-fix' into maint | Junio C Hamano | 2017-06-13 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | clean: teach clean -d to preserve ignored paths | Samuel Lijin | 2017-05-24 |
| * | | | | | | | dir: hide untracked contents of untracked dirs | Samuel Lijin | 2017-05-22 |
| * | | | | | | | t7061: status --ignored should search untracked dirs | Samuel Lijin | 2017-05-22 |
| * | | | | | | | t7300: clean -d should skip dirs with ignored files | Samuel Lijin | 2017-05-22 |
* | | | | | | | | Merge branch 'jc/skip-test-in-the-middle' into maint | Junio C Hamano | 2017-06-13 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t5545: enhance test coverage when no http server is installed | Stefan Beller | 2017-05-18 |
| * | | | | | | | | test: allow skipping the remainder | Junio C Hamano | 2017-05-18 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'bw/forking-and-threading' into maint | Junio C Hamano | 2017-06-13 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | run-command: restrict PATH search to executable files | Brandon Williams | 2017-04-25 |
| * | | | | | | | | t0061: run_command executes scripts without a #! line | Brandon Williams | 2017-04-20 |
| * | | | | | | | | t5550: use write_script to generate post-update hook | Brandon Williams | 2017-04-18 |
* | | | | | | | | | Merge branch 'jk/bug-to-abort' into maint | Junio C Hamano | 2017-06-13 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | config: complain about --local outside of a git repo | Jeff King | 2017-05-15 |
| * | | | | | | | | | setup_git_env: convert die("BUG") to BUG() | Jeff King | 2017-05-15 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'sb/checkout-recurse-submodules' into maint | Junio C Hamano | 2017-06-13 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | submodule: properly recurse for read-tree and checkout | Stefan Beller | 2017-05-04 |
* | | | | | | | | | | Merge branch 'sd/t3200-typofix' into maint | Junio C Hamano | 2017-06-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | branch test: fix invalid config key access | Sahil Dua | 2017-05-29 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'sb/t5531-update-desc' into maint | Junio C Hamano | 2017-06-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t5531: fix test description | Stefan Beller | 2017-05-23 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'tb/dedup-crlf-tests' into maint | Junio C Hamano | 2017-06-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t0027: tests are not expensive; remove t0025 | Torsten Bögershausen | 2017-05-10 |
* | | | | | | | | | | | Merge branch 'jk/alternate-ref-optim' into maint | Junio C Hamano | 2017-06-05 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t5400: avoid concurrent writes into a trace file | Jeff King | 2017-05-18 |
* | | | | | | | | | | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint | Junio C Hamano | 2017-06-05 |
|\ \ \ \ \ \ \ \ \ \ \ \ |