summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* symbolic-ref -d: do not allow removal of HEADjc/forbid-symbolic-ref-d-HEADJunio C Hamano2016-09-021-7/+14
* Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-121-0/+14
|\
| * difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar2016-07-281-0/+14
* | Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-101-3/+3
|\ \
| * | use strbuf_addstr() for adding constant strings to a strbufRené Scharfe2016-08-011-3/+3
* | | Merge branch 'jk/t4205-cleanup' into maintJunio C Hamano2016-08-101-198/+200
|\ \ \
| * | | t4205: indent here documentsjk/t4205-cleanupJeff King2016-07-271-196/+196
| * | | t4205: drop top-level &&-chainingJeff King2016-07-271-2/+4
* | | | Merge branch 'nd/fbsd-lazy-mtime' into maintJunio C Hamano2016-08-101-1/+16
|\ \ \ \
| * | | | t7063: work around FreeBSD's lazy mtime update featurend/fbsd-lazy-mtimeNguyễn Thái Ngọc Duy2016-08-041-1/+16
| | |/ / | |/| |
* | | | Merge branch 'js/t4130-rename-without-ino' into maintJunio C Hamano2016-08-101-3/+7
|\ \ \ \
| * | | | t4130: work around Windows limitationjs/t4130-rename-without-inoJohannes Sixt2016-08-031-3/+7
* | | | | Merge branch 'jc/grep-commandline-vs-configuration' into maintJunio C Hamano2016-08-101-0/+14
|\ \ \ \ \
| * | | | | grep: further simplify setting the pattern typejc/grep-commandline-vs-configurationJunio C Hamano2016-07-251-0/+14
* | | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2016-08-101-0/+11
|\ \ \ \ \ \
| * | | | | | diff: do not reuse worktree files that need "clean" conversionjk/diff-do-not-reuse-wtf-needs-cleaningJeff King2016-07-221-0/+11
* | | | | | | Merge branch 'mm/status-suggest-merge-abort' into maintJunio C Hamano2016-08-102-0/+5
|\ \ \ \ \ \ \
| * | | | | | | status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abortMatthieu Moy2016-07-222-0/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano2016-08-082-1/+12
|\ \ \ \ \ \ \
| * | | | | | | submodule-config: passing name reference for .gitmodule blobsHeiko Voigt2016-07-281-0/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t/test-lib.sh: fix running tests with --valgrindJohannes Schindelin2016-07-111-1/+1
* | | | | | | | Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano2016-08-083-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messagesAlex Henrie2016-06-273-7/+7
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-081-4/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limitNguyễn Thái Ngọc Duy2016-07-131-4/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-081-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eolJohannes Schindelin2016-07-111-1/+1
| * | | | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eolJohannes Schindelin2016-07-111-0/+8
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/push-scrub-url' into maintJunio C Hamano2016-08-081-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | t5541: fix url scrubbing test when GPG is not setjk/push-scrub-urlJeff King2016-07-201-2/+4
| * | | | | | | | push: anonymize URL in status outputJeff King2016-07-141-0/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/cache-tree-ita' into maintJunio C Hamano2016-08-0814-50/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesnd/cache-tree-itaNguyễn Thái Ngọc Duy2016-07-181-0/+14
| * | | | | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimesNguyễn Thái Ngọc Duy2016-07-181-0/+17
| * | | | | | | | test-lib.sh: introduce and use $EMPTY_BLOBNguyễn Thái Ngọc Duy2016-07-188-38/+35
| * | | | | | | | test-lib.sh: introduce and use $EMPTY_TREENguyễn Thái Ngọc Duy2016-07-186-13/+11
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-081-17/+62
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | t/t8003-blame-corner-cases.sh: Use here documentsMike Hommey2016-07-181-17/+17
| * | | | | | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-181-0/+45
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'da/difftool' into maintJunio C Hamano2016-06-061-0/+23
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-061-170/+131
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-061-0/+42
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2016-07-281-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7610: test for mktemp before test executionArmin Kunaschik2016-07-061-1/+6
* | | | | | | | | | | Merge branch 'nd/icase' into maintJunio C Hamano2016-07-284-3/+148
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diffcore-pickaxe: support case insensitive match on non-asciiNguyễn Thái Ngọc Duy2016-07-011-0/+7
| * | | | | | | | | | | grep/pcre: support utf-8Nguyễn Thái Ngọc Duy2016-07-011-0/+15
| * | | | | | | | | | | grep/pcre: prepare locale-dependent tables for icase matchingNguyễn Thái Ngọc Duy2016-07-011-0/+19
| * | | | | | | | | | | grep/icase: avoid kwsset when -F is specifiedNguyễn Thái Ngọc Duy2016-07-011-0/+26