summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Sync with 2.13.6Junio C Hamano2017-09-221-0/+48
|\
| * Sync with 2.12.5Junio C Hamano2017-09-221-0/+48
| |\
| | * Sync with 2.11.4Junio C Hamano2017-09-221-0/+48
| | |\
| | | * Sync with 2.10.5Junio C Hamano2017-09-221-0/+48
| | | |\
| | | | * Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10Junio C Hamano2017-09-221-0/+48
| | | | |\
| | | | | * shell: drop git-cvsserver support by defaultjk/git-shell-drop-cvsserverJeff King2017-09-121-0/+48
* | | | | | Merge branch 'hv/t5526-andand-chain-fix' into maintJunio C Hamano2017-09-101-4/+4
|\ \ \ \ \ \
| * | | | | | t5526: fix some broken && chainshv/t5526-andand-chain-fixHeiko Voigt2017-08-171-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs/t1002-do-not-use-sum' into maintJunio C Hamano2017-09-102-35/+35
|\ \ \ \ \ \
| * | | | | | t1002: stop using sum(1)rs/t1002-do-not-use-sumRené Scharfe2017-08-152-35/+35
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs/t3700-clean-leftover' into maintJunio C Hamano2017-09-101-0/+1
|\ \ \ \ \ \
| * | | | | | t3700: fix broken test under !POSIXPERMrs/t3700-clean-leftoverRené Scharfe2017-08-081-0/+1
* | | | | | | Merge branch 'ab/ref-filter-no-contains' into maintJunio C Hamano2017-09-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | tests: don't give unportable ">" to "test" built-in, use -gtab/ref-filter-no-containsÆvar Arnfjörð Bjarmason2017-08-071-1/+1
* | | | | | | | Merge branch 'rs/archive-excluded-directory' into maintJunio C Hamano2017-09-101-3/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | archive: don't queue excluded directoriesRené Scharfe2017-08-191-2/+2
| * | | | | | | | t5001: add tests for export-ignore attributes and exclude pathspecsRené Scharfe2017-08-191-3/+44
* | | | | | | | | Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-101-0/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-231-0/+15
| |/ / / / / / / /
* | | | | | | | | Merge branch 'tb/apply-with-crlf' into maintJunio C Hamano2017-09-101-6/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlfTorsten Bögershausen2017-08-191-6/+27
| |/ / / / / / / /
* | | | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maintJunio C Hamano2017-09-101-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-grep: correct exit code with --quiet and -Las/grep-quiet-no-match-exit-code-fixAnthony Sottile2017-08-171-0/+5
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pw/am-signoff' into maintJunio C Hamano2017-09-101-20/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | am: fix signoff when other trailers are presentpw/am-signoffPhillip Wood2017-08-081-20/+63
* | | | | | | | | | Merge branch 'rs/in-obsd-basename-dirname-take-const' into maintJunio C Hamano2017-09-101-2/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-path-utils: handle const parameter of basename and dirnamers/in-obsd-basename-dirname-take-constRené Scharfe2017-08-071-2/+16
* | | | | | | | | | | Merge branch 'rs/t4062-obsd' into maintJunio C Hamano2017-09-101-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t4062: use less than 256 repetitions in regexrs/t4062-obsdRené Scharfe2017-08-091-1/+3
* | | | | | | | | | | | Merge branch 'rs/obsd-getcwd-workaround' into maintJunio C Hamano2017-09-101-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t0001: skip test with restrictive permissions if getpwd(3) respects themrs/obsd-getcwd-workaroundRené Scharfe2017-08-071-2/+28
* | | | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maintJunio C Hamano2017-09-101-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quietBrandon Williams2017-08-041-0/+6
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'pw/sequence-rerere-autoupdate' into maintJunio C Hamano2017-09-102-45/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdatePhillip Wood2017-08-021-0/+13
| * | | | | | | | | | | | | cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-021-7/+53
| * | | | | | | | | | | | | t3504: use test_commitPhillip Wood2017-08-021-12/+9
| * | | | | | | | | | | | | rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-021-0/+3
| * | | | | | | | | | | | | rebase: honor --rerere-autoupdatePhillip Wood2017-08-021-27/+55
* | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano2017-09-101-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodulesBrandon Williams2017-07-201-1/+24
* | | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-101-0/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git.c: ignore pager.* when launching builtin as dashed externalma/pager-per-subcommand-actionMartin Ågren2017-08-031-1/+1
| * | | | | | | | | | | | | | | tag: change default of `pager.tag` to "on"Martin Ågren2017-08-031-14/+14
| * | | | | | | | | | | | | | | tag: respect `pager.tag` in list-mode onlyMartin Ågren2017-08-031-1/+14
| * | | | | | | | | | | | | | | t7006: add tests for how git tag paginatesMartin Ågren2017-08-031-0/+67
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/rev-list-empty-input' into maintJunio C Hamano2017-09-102-11/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | revision: do not fallback to default when rev_input_given is setjk/rev-list-empty-inputJeff King2017-08-021-0/+6
| * | | | | | | | | | | | | | | rev-list: don't show usage when we see empty ref patternsJeff King2017-08-021-3/+3
| * | | | | | | | | | | | | | | t6018: flesh out empty input/output rev-list testsJeff King2017-08-021-11/+9
| |/ / / / / / / / / / / / / /