summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/log-to-diffopt-file'Junio C Hamano2016-07-192-0/+13
|\
| * mingw: fix the shortlog --output=<file> testjs/log-to-diffopt-fileJohannes Schindelin2016-07-111-2/+2
| * t4211: ensure that log respects --output=<file>Johannes Schindelin2016-06-241-0/+7
| * shortlog: respect the --output=<file> settingJohannes Schindelin2016-06-241-0/+6
* | archive-tar: huge offset and future timestamps would not work on 32-bitJunio C Hamano2016-07-151-6/+6
* | Sync with 2.9.2Junio C Hamano2016-07-152-3/+12
|\ \
| * \ Merge branch 'jk/tzoffset-fix' into maintJunio C Hamano2016-07-152-3/+12
| |\ \
| | * | t0006: skip "far in the future" test when unsigned long is not long enoughjk/tzoffset-fixJeff King2016-07-152-3/+12
| * | | Merge branch 'jc/t2300-setup' into maintJunio C Hamano2016-07-111-1/+9
| |\ \ \
| * \ \ \ Merge branch 'cb/t7810-test-label-fix' into maintJunio C Hamano2016-07-111-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'sb/t5614-modernize' into maintJunio C Hamano2016-07-111-50/+20
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/perf-on-apple' into maintJunio C Hamano2016-07-111-1/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ak/t7800-wo-readlink' into maintJunio C Hamano2016-07-111-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/tzoffset-fix' into maintJunio C Hamano2016-07-112-17/+69
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'sb/clone-shallow-passthru' into maintJunio C Hamano2016-07-111-2/+17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/graph-width-padded' into maintJunio C Hamano2016-07-111-0/+57
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-07-061-0/+30
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-07-062-1/+23
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano2016-06-277-77/+278
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-271-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'et/pretty-format-c-auto' into maintJunio C Hamano2016-06-271-7/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/upload-pack-hook'Junio C Hamano2016-07-141-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | mingw: fix regression in t1308-config-setjk/upload-pack-hookJohannes Schindelin2016-07-141-1/+9
* | | | | | | | | | | | | | | | | Merge branch 'jk/big-and-future-archive-tar'Junio C Hamano2016-07-135-20/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | archive-tar: write extended headers for far-future mtimeJeff King2016-07-011-2/+2
| * | | | | | | | | | | | | | | | | archive-tar: write extended headers for file sizes >= 8GBJeff King2016-07-011-2/+2
| * | | | | | | | | | | | | | | | | t5000: test tar files that overflow ustar headersJeff King2016-07-013-0/+74
| * | | | | | | | | | | | | | | | | t9300: factor out portable "head -c" replacementJeff King2016-07-012-20/+17
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'nd/ita-cleanup'Junio C Hamano2016-07-131-1/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | grep: fix grepping for "intent to add" filesnd/ita-cleanupCharles Bailey2016-07-011-0/+58
| * | | | | | | | | | | | | | | | | t7810-grep.sh: fix a whitespace inconsistencyCharles Bailey2016-07-011-1/+1
| * | | | | | | | | | | | | | | | | t7810-grep.sh: fix duplicated test nameCharles Bailey2016-07-011-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'ps/rebase-i-auto-unstash-upon-abort'Junio C Hamano2016-07-131-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | rebase -i: restore autostash on abortps/rebase-i-auto-unstash-upon-abortPatrick Steinhardt2016-06-291-0/+31
* | | | | | | | | | | | | | | | | | | Merge branch 'js/t3404-grammo-fix'Junio C Hamano2016-07-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t3404: fix a grammo (commands are ran -> commands are run)js/t3404-grammo-fixJohannes Schindelin2016-06-291-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'dg/subtree-rebase-test'Junio C Hamano2016-07-131-0/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | contrib/subtree: Add a test for subtree rebase that loses commitsdg/subtree-rebase-testDavid A. Greene2016-06-281-0/+119
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/unpack-trees-advice-messages'Junio C Hamano2016-07-133-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messagesAlex Henrie2016-06-273-7/+7
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-1335-93/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t5541: become resilient to GETTEXT_POISONVasco Almeida2016-07-011-6/+6
| * | | | | | | | | | | | | | | | | | | | | i18n: notes: mark strings for translationVasco Almeida2016-06-172-5/+5
| * | | | | | | | | | | | | | | | | | | | | i18n: bisect: mark strings for translationVasco Almeida2016-06-171-11/+11
| * | | | | | | | | | | | | | | | | | | | | t5523: use test_i18ngrep for negationVasco Almeida2016-06-171-4/+4
| * | | | | | | | | | | | | | | | | | | | | t4153: fix negated test_i18ngrep callVasco Almeida2016-06-171-1/+1
| * | | | | | | | | | | | | | | | | | | | | t9003: become resilient to GETTEXT_POISONVasco Almeida2016-06-171-2/+2
| * | | | | | | | | | | | | | | | | | | | | tests: unpack-trees: update to use test_i18n* functionsVasco Almeida2016-06-174-6/+6
| * | | | | | | | | | | | | | | | | | | | | tests: use test_i18n* functions to suppress false positivesVasco Almeida2016-06-1721-44/+41
| * | | | | | | | | | | | | | | | | | | | | i18n: setup: mark strings for translationVasco Almeida2016-06-172-3/+3