Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/t3600-rephrase' | Junio C Hamano | 2017-03-27 | 1 | -1/+1 |
|\ | |||||
| * | t3600: rename test to describe its functionalitysb/t3600-rephrase | Stefan Beller | 2017-03-22 | 1 | -1/+1 |
* | | Merge branch 'sb/describe-broken' | Junio C Hamano | 2017-03-27 | 1 | -0/+20 |
|\ \ | |||||
| * | | builtin/describe: introduce --broken flagsb/describe-broken | Stefan Beller | 2017-03-22 | 1 | -0/+20 |
* | | | Merge branch 'sb/push-options-via-transport' | Junio C Hamano | 2017-03-27 | 1 | -2/+31 |
|\ \ \ | |||||
| * | | | remote-curl: allow push optionssb/push-options-via-transport | Brandon Williams | 2017-03-22 | 1 | -2/+31 |
* | | | | Merge branch 'km/t1400-modernization' | Junio C Hamano | 2017-03-27 | 1 | -76/+78 |
|\ \ \ \ | |||||
| * | | | | t1400: use test_when_finished for cleanup | Kyle Meyer | 2017-03-21 | 1 | -40/+41 |
| * | | | | t1400: remove a set of unused output files | Kyle Meyer | 2017-03-21 | 1 | -2/+2 |
| * | | | | t1400: use test_path_is_* helpers | Kyle Meyer | 2017-03-21 | 1 | -22/+22 |
| * | | | | t1400: set core.logAllRefUpdates in "logged by touch" tests | Kyle Meyer | 2017-03-21 | 1 | -11/+12 |
| * | | | | t1400: rename test descriptions to be unique | Kyle Meyer | 2017-03-21 | 1 | -4/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jk/prefix-filename' | Junio C Hamano | 2017-03-27 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | hash-object: fix buffer reuse with --path in a subdirectory | Jeff King | 2017-03-21 | 1 | -0/+10 |
| |/ / / | |||||
* | | | | Merge branch 'jc/lint-runaway-here-doc' | Junio C Hamano | 2017-03-27 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | tests: lint for run-away here-docjc/lint-runaway-here-doc | Junio C Hamano | 2017-03-23 | 1 | -3/+3 |
* | | | | | Merge branch 'st/verify-tag' | Junio C Hamano | 2017-03-27 | 2 | -14/+10 |
|\ \ \ \ \ | |||||
| * | | | | | t7004, t7030: fix here-doc syntax errorsst/verify-tag | Santiago Torres | 2017-03-24 | 2 | -14/+10 |
* | | | | | | Merge branch 'sb/submodule-update-initial-runs-custom-script' | Junio C Hamano | 2017-03-27 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t7406: correct test case for submodule-update initial populationsb/submodule-update-initial-runs-custom-script | Junio C Hamano | 2017-03-22 | 1 | -3/+3 |
* | | | | | | | Merge branch 'jk/quote-env-path-list-component' | Junio C Hamano | 2017-03-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5615: fix a here-doc syntax errorjk/quote-env-path-list-component | Junio C Hamano | 2017-03-22 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'jk/sha1dc' | Junio C Hamano | 2017-03-24 | 2 | -0/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t0013: add a basic sha1 collision detection test | Jeff King | 2017-03-17 | 2 | -0/+19 |
* | | | | | | | | | Merge branch 'sg/test-with-stdin' | Junio C Hamano | 2017-03-24 | 2 | -8/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tests: make the 'test_pause' helper work in non-verbose modesg/test-with-stdin | SZEDER Gábor | 2017-03-18 | 1 | -7/+2 |
| * | | | | | | | | | tests: create an interactive gdb session with the 'debug' helper | SZEDER Gábor | 2017-03-18 | 2 | -1/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'js/realpath-pathdup-fix' into maint | Junio C Hamano | 2017-03-16 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ax/line-log-range-merge-fix' into maint | Junio C Hamano | 2017-03-16 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-i-patch-do-prompt' into maint | Junio C Hamano | 2017-03-16 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/regexec-buf' | Junio C Hamano | 2017-03-24 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pickaxe: fix segfault with '-S<...> --pickaxe-regex'js/regexec-buf | SZEDER Gábor | 2017-03-18 | 1 | -0/+5 |
* | | | | | | | | | | | | | Merge branch 'dl/credential-cache-socket-in-xdg-cache' | Junio C Hamano | 2017-03-24 | 1 | -0/+93 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | credential-cache: add tests for XDG functionality | Devin Lehmacher | 2017-03-17 | 1 | -0/+93 |
* | | | | | | | | | | | | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-03-21 | 1 | -1/+57 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | config: add conditional include | Nguyễn Thái Ngọc Duy | 2017-03-11 | 1 | -1/+57 |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-03-20 | 1 | -2/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | difftool: handle modified symlinks in dir-diff mode | David Aguilar | 2017-03-15 | 1 | -0/+60 |
| * | | | | | | | | | | | | t7800: cleanup cruft left behind by tests | David Aguilar | 2017-03-15 | 1 | -1/+4 |
| * | | | | | | | | | | | | t7800: remove whitespace before redirect | David Aguilar | 2017-03-15 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'jk/cherry-pick-0-mainline' | Junio C Hamano | 2017-03-17 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | cherry-pick: detect bogus arguments to --mainlinejk/cherry-pick-0-mainline | Jeff King | 2017-03-15 | 1 | -0/+9 |
* | | | | | | | | | | | | | | Merge branch 'js/early-config' | Junio C Hamano | 2017-03-17 | 3 | -4/+103 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t1309: document cases where we would want early config not to die() | Johannes Schindelin | 2017-03-14 | 1 | -0/+24 |
| * | | | | | | | | | | | | | | t1309: test read_early_config() | Johannes Schindelin | 2017-03-14 | 2 | -0/+65 |
| * | | | | | | | | | | | | | | read_early_config(): really discover .git/ | Johannes Schindelin | 2017-03-14 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | t7006: replace dubious test | Johannes Schindelin | 2017-03-03 | 1 | -1/+11 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'jk/add-i-use-pathspecs' | Junio C Hamano | 2017-03-17 | 1 | -0/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | add--interactive: do not expand pathspecs with ls-filesjk/add-i-use-pathspecs | Jeff King | 2017-03-14 | 1 | -0/+43 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'bw/attr-pathspec' | Junio C Hamano | 2017-03-17 | 1 | -0/+200 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |