Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-11-29 | 2 | -3/+18 |
|\ | |||||
| * | valgrind: support test helpersnd/test-helpers | René Scharfe | 2016-10-27 | 2 | -3/+18 |
* | | Merge branch 'as/merge-attr-sleep' into maint | Junio C Hamano | 2016-11-29 | 1 | -5/+13 |
|\ \ | |||||
| * | | t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleep | Johannes Sixt | 2016-11-11 | 1 | -1/+9 |
| * | | t6026: ensure that long-running script really is | Johannes Schindelin | 2016-11-10 | 1 | -4/+4 |
| * | | Revert "t6026-merge-attr: don't fail if sleep exits early" | Junio C Hamano | 2016-11-10 | 1 | -1/+1 |
| * | | Revert "t6026-merge-attr: ensure that the merge driver was called" | Junio C Hamano | 2016-11-10 | 1 | -2/+1 |
| * | | t6026-merge-attr: ensure that the merge driver was called | Andreas Schwab | 2016-11-10 | 1 | -1/+2 |
| * | | t6026-merge-attr: don't fail if sleep exits early | Andreas Schwab | 2016-11-08 | 1 | -1/+1 |
* | | | Merge branch 'mm/send-email-cc-cruft-after-address' into maint | Junio C Hamano | 2016-11-29 | 2 | -4/+33 |
|\ \ \ | |||||
| * | | | t9000-addresses: update expected results after fix | Matthieu Moy | 2016-10-21 | 1 | -4/+4 |
| * | | | parse_mailboxes: accept extra text after <...> address | Matthieu Moy | 2016-10-14 | 1 | -0/+29 |
* | | | | Merge branch 'pb/test-parse-options-expect' into maint | Junio C Hamano | 2016-10-28 | 1 | -170/+13 |
|\ \ \ \ | |||||
| * | | | | t0040: convert all possible tests to use `test-parse-options --expect`pb/test-parse-options-expect | Pranit Bauva | 2016-10-17 | 1 | -170/+13 |
* | | | | | Merge branch 'jk/tap-verbose-fix' into maint | Junio C Hamano | 2016-10-28 | 2 | -4/+36 |
|\ \ \ \ \ | |||||
| * | | | | | test-lib: bail out when "-v" used under "prove"jk/tap-verbose-fix | Jeff King | 2016-10-24 | 1 | -0/+10 |
| * | | | | | test-lib: add --verbose-log option | Jeff King | 2016-10-21 | 2 | -3/+25 |
| * | | | | | test-lib: handle TEST_OUTPUT_DIRECTORY with spaces | Jeff King | 2016-10-21 | 1 | -2/+2 |
* | | | | | | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t3700: fix broken test under !SANITYtg/add-chmod+x-fix | Junio C Hamano | 2016-10-20 | 1 | -0/+1 |
* | | | | | | | Merge branch 'jk/fetch-quick-tag-following' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+99 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-following | Jeff King | 2016-10-14 | 1 | -0/+99 |
* | | | | | | | | Merge branch 'jk/merge-base-fork-point-without-reflog' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflog | Jeff King | 2016-10-12 | 1 | -0/+6 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | worktree: allow the main brach of a bare repository to be checked outdk/worktree-dup-checkout-with-bare-is-ok | Dennis Kaarsemaker | 2016-10-14 | 1 | -0/+8 |
* | | | | | | | | | Merge branch 'jk/ref-symlink-loop' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | files_read_raw_ref: avoid infinite loop on broken symlinks | Jeff King | 2016-10-10 | 1 | -0/+5 |
* | | | | | | | | | Merge branch 'kd/mailinfo-quoted-string' into maint | Junio C Hamano | 2016-10-11 | 5 | -33/+77 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | mailinfo: unescape quoted-pair in header fieldskd/mailinfo-quoted-string | Kevin Daudt | 2016-09-28 | 5 | -0/+42 |
| * | | | | | | | | t5100-mailinfo: replace common path prefix with variable | Kevin Daudt | 2016-09-28 | 1 | -33/+35 |
* | | | | | | | | | Merge branch 'jk/pack-tag-of-tag' into maint | Junio C Hamano | 2016-10-03 | 1 | -29/+65 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pack-objects: walk tag chains for --include-tagjk/pack-tag-of-tag | Jeff King | 2016-09-07 | 1 | -0/+52 |
| * | | | | | | | | | t5305: simplify packname handling | Jeff King | 2016-09-07 | 1 | -6/+6 |
| * | | | | | | | | | t5305: use "git -C" | Jeff King | 2016-09-07 | 1 | -21/+7 |
| * | | | | | | | | | t5305: drop "dry-run" of unpack-objects | Jeff King | 2016-09-07 | 1 | -2/+0 |
| * | | | | | | | | | t5305: move cleanup into test block | Jeff King | 2016-09-07 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-09-29 | 2 | -0/+61 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | t3700-add: do not check working tree file mode without POSIXPERM | Johannes Sixt | 2016-09-21 | 1 | -4/+2 |
| * | | | | | | | | | t3700-add: create subdirectory gently | Johannes Sixt | 2016-09-21 | 1 | -1/+1 |
| * | | | | | | | | | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 | 1 | -0/+50 |
| * | | | | | | | | | update-index: add test for chmod flags | Thomas Gummerer | 2016-09-14 | 1 | -0/+13 |
* | | | | | | | | | | Merge branch 'rt/rebase-i-broken-insn-advise' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-advise | Ralf Thielow | 2016-09-07 | 1 | -3/+3 |
* | | | | | | | | | | | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2016-09-29 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | regex: use regexec_buf() | Johannes Schindelin | 2016-09-21 | 1 | -1/+1 |
| * | | | | | | | | | | | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and fails | Johannes Schindelin | 2016-09-21 | 1 | -0/+22 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'nd/checkout-disambiguation' into maint | Junio C Hamano | 2016-09-29 | 2 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguation | Nguyễn Thái Ngọc Duy | 2016-09-21 | 2 | -0/+21 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/rebase-i-drop-ident-check' into maint | Junio C Hamano | 2016-09-29 | 1 | -0/+47 |
|\ \ \ \ \ \ \ \ \ \ \ |