summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/no-optional-locks'Junio C Hamano2017-10-031-0/+10
|\
| * git: add --no-optional-locks optionJeff King2017-09-271-0/+10
* | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-031-0/+256
|\ \
| * | branch: fix "copy" to never touch HEADJunio C Hamano2017-09-241-5/+5
| * | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-181-0/+215
| * | branch: add test for -m renaming multiple config sectionsÆvar Arnfjörð Bjarmason2017-06-181-0/+41
* | | Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano2017-10-033-3/+113
|\ \ \
| * | | parse-options: only insert newline in help text if neededbc/rev-parse-parseopt-fixBrandon Casey2017-09-251-2/+2
| * | | parse-options: write blank line to correct output streamBrandon Casey2017-09-252-4/+4
| * | | t0040,t1502: Demonstrate parse_options bugsBrandon Casey2017-09-253-3/+107
| * | | rev-parse parseopt: interpret any whitespace as start of help textBrandon Casey2017-09-191-1/+1
| * | | rev-parse parseopt: do not search help text for flag charsBrandon Casey2017-09-191-2/+2
| * | | t1502: demonstrate rev-parse --parseopt option mis-parsingBrandon Casey2017-09-191-6/+12
* | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-032-19/+31
|\ \ \ \
| * | | | rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-271-1/+1
| * | | | t3415: test fixup with wrapped onelineJohannes Schindelin2017-07-271-0/+14
| * | | | t3404: relax rebase.missingCommitsCheck testsJohannes Schindelin2017-07-271-18/+4
| * | | | t3415: verify that an empty instructionFormat is handled as beforeJohannes Schindelin2017-07-271-0/+12
* | | | | Merge branch 'jt/fast-export-copy-modify-fix'Junio C Hamano2017-09-291-1/+19
|\ \ \ \ \
| * | | | | fast-export: do not copy from modified filejt/fast-export-copy-modify-fixJonathan Tan2017-09-211-1/+19
* | | | | | Merge branch 'mk/describe-match-with-all'Junio C Hamano2017-09-291-0/+27
|\ \ \ \ \ \
| * | | | | | describe: teach --match to handle branches and remotesmk/describe-match-with-allMax Kirillov2017-09-201-0/+27
| * | | | | | Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-allJunio C Hamano2017-09-201-1/+5
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/fallthrough'Junio C Hamano2017-09-281-21/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | test-line-buffer: simplify command parsingJeff King2017-09-221-21/+11
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/diff-blob'Junio C Hamano2017-09-281-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | cat-file: handle NULL object_context.pathjk/diff-blobJeff King2017-09-221-0/+5
* | | | | | | | | Merge branch 'jk/describe-omit-some-refs'Junio C Hamano2017-09-281-1/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | describe: fix matching to actually match all patternsjk/describe-omit-some-refsMax Kirillov2017-09-171-1/+5
* | | | | | | | | Sync with 2.14.2Junio C Hamano2017-09-261-0/+48
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | 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 'ks/test-readme-phrasofix'Junio C Hamano2017-09-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/README: fix typo and grammatically improve a sentenceks/test-readme-phrasofixKaartic Sivaraam2017-09-191-3/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ow/rev-parse-is-shallow-repo'Junio C Hamano2017-09-251-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rev-parse: rev-parse: add --is-shallow-repositoryow/rev-parse-is-shallow-repoØystein Walle2017-09-191-0/+15
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rj/test-ulimit-on-windows'Junio C Hamano2017-09-255-40/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t9010-*.sh: skip all tests if the PIPE prereq is missingrj/test-ulimit-on-windowsRamsay Jones2017-09-191-27/+28
| * | | | | | | | | | | | test-lib: use more compact expression in PIPE prerequisiteRamsay Jones2017-09-191-8/+2
| * | | | | | | | | | | | test-lib: don't use ulimit in test prerequisites on cygwinRamsay Jones2017-09-154-5/+12
* | | | | | | | | | | | | Merge branch 'tb/test-lint-echo-e'Junio C Hamano2017-09-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | test-lint: echo -e (or -E) is not portabletb/test-lint-echo-eTorsten Bögershausen2017-09-211-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'hv/mv-nested-submodules-test'Junio C Hamano2017-09-251-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add test for bug in git-mv for recursive submoduleshv/mv-nested-submodules-testHeiko Voigt2017-09-171-0/+25
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/archive-excluded-directory'Junio C Hamano2017-09-253-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | archive: don't add empty directories to archivesrs/archive-excluded-directoryRené Scharfe2017-09-143-4/+4