Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10 | Junio C Hamano | 2017-09-22 |
|\ | |||
| * | shell: drop git-cvsserver support by default | Jeff King | 2017-09-12 |
* | | Merge tag 'v2.9.5' into maint-2.10 | Junio C Hamano | 2017-07-30 |
|\ \ | |/ | |||
| * | Merge tag 'v2.8.6' into maint-2.9 | Junio C Hamano | 2017-07-30 |
| |\ | |||
| | * | Merge tag 'v2.7.6' into maint-2.8 | Junio C Hamano | 2017-07-30 |
| | |\ | |||
| | | * | connect: reject paths that look like command line options | Jeff King | 2017-07-28 |
| | | * | connect: reject dashed arguments for proxy commands | Jeff King | 2017-07-28 |
| | | * | t5813: add test for hostname starting with dash | Jeff King | 2017-07-28 |
* | | | | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-11-29 |
|\ \ \ \ | |||
| * | | | | valgrind: support test helpers | René Scharfe | 2016-10-27 |
* | | | | | Merge branch 'as/merge-attr-sleep' into maint | Junio C Hamano | 2016-11-29 |
|\ \ \ \ \ | |||
| * | | | | | t6026: clarify the point of "kill $(cat sleep.pid)" | Johannes Sixt | 2016-11-11 |
| * | | | | | t6026: ensure that long-running script really is | Johannes Schindelin | 2016-11-10 |
| * | | | | | Revert "t6026-merge-attr: don't fail if sleep exits early" | Junio C Hamano | 2016-11-10 |
| * | | | | | Revert "t6026-merge-attr: ensure that the merge driver was called" | Junio C Hamano | 2016-11-10 |
| * | | | | | t6026-merge-attr: ensure that the merge driver was called | Andreas Schwab | 2016-11-10 |
| * | | | | | t6026-merge-attr: don't fail if sleep exits early | Andreas Schwab | 2016-11-08 |
* | | | | | | Merge branch 'mm/send-email-cc-cruft-after-address' into maint | Junio C Hamano | 2016-11-29 |
|\ \ \ \ \ \ | |||
| * | | | | | | t9000-addresses: update expected results after fix | Matthieu Moy | 2016-10-21 |
| * | | | | | | parse_mailboxes: accept extra text after <...> address | Matthieu Moy | 2016-10-14 |
* | | | | | | | Merge branch 'pb/test-parse-options-expect' into maint | Junio C Hamano | 2016-10-28 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t0040: convert all possible tests to use `test-parse-options --expect` | Pranit Bauva | 2016-10-17 |
* | | | | | | | | Merge branch 'jk/tap-verbose-fix' into maint | Junio C Hamano | 2016-10-28 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | test-lib: bail out when "-v" used under "prove" | Jeff King | 2016-10-24 |
| * | | | | | | | | test-lib: add --verbose-log option | Jeff King | 2016-10-21 |
| * | | | | | | | | test-lib: handle TEST_OUTPUT_DIRECTORY with spaces | Jeff King | 2016-10-21 |
| | |_|_|_|_|/ / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-10-28 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t3700: fix broken test under !SANITY | Junio C Hamano | 2016-10-20 |
* | | | | | | | | | Merge branch 'jk/fetch-quick-tag-following' into maint | Junio C Hamano | 2016-10-28 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | fetch: use "quick" has_sha1_file for tag following | Jeff King | 2016-10-14 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jk/merge-base-fork-point-without-reflog' into maint | Junio C Hamano | 2016-10-28 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | merge-base: handle --fork-point without reflog | Jeff King | 2016-10-12 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maint | Junio C Hamano | 2016-10-28 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | worktree: allow the main brach of a bare repository to be checked out | Dennis Kaarsemaker | 2016-10-14 |
* | | | | | | | | | | Merge branch 'jk/ref-symlink-loop' into maint | Junio C Hamano | 2016-10-28 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||
| * | | | | | | | | | files_read_raw_ref: avoid infinite loop on broken symlinks | Jeff King | 2016-10-10 |
* | | | | | | | | | | Merge branch 'kd/mailinfo-quoted-string' into maint | Junio C Hamano | 2016-10-11 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||
| * | | | | | | | | | mailinfo: unescape quoted-pair in header fields | Kevin Daudt | 2016-09-28 |
| * | | | | | | | | | t5100-mailinfo: replace common path prefix with variable | Kevin Daudt | 2016-09-28 |
* | | | | | | | | | | Merge branch 'jk/pack-tag-of-tag' into maint | Junio C Hamano | 2016-10-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | pack-objects: walk tag chains for --include-tag | Jeff King | 2016-09-07 |
| * | | | | | | | | | | t5305: simplify packname handling | Jeff King | 2016-09-07 |
| * | | | | | | | | | | t5305: use "git -C" | Jeff King | 2016-09-07 |
| * | | | | | | | | | | t5305: drop "dry-run" of unpack-objects | Jeff King | 2016-09-07 |
| * | | | | | | | | | | t5305: move cleanup into test block | Jeff King | 2016-09-07 |
* | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | t3700-add: do not check working tree file mode without POSIXPERM | Johannes Sixt | 2016-09-21 |
| * | | | | | | | | | | t3700-add: create subdirectory gently | Johannes Sixt | 2016-09-21 |
| * | | | | | | | | | | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 |
| * | | | | | | | | | | update-index: add test for chmod flags | Thomas Gummerer | 2016-09-14 |