summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maintJunio C Hamano2017-01-311-11/+15
|\
| * t7810: avoid assumption about invalid regex syntaxjk/grep-e-could-be-extended-beyond-posixJeff King2017-01-111-11/+15
* | Merge branch 'km/branch-get-push-while-detached' into maintJunio C Hamano2017-01-311-0/+6
|\ \
| * | branch_get_push: do not segfault when HEAD is detachedkm/branch-get-push-while-detachedKyle Meyer2017-01-071-0/+6
| |/
* | Merge branch 'jk/blame-fixes' into maintJunio C Hamano2017-01-312-0/+149
|\ \
| * | blame: output porcelain "previous" header for each filejk/blame-fixesJeff King2017-01-071-0/+117
| * | blame: handle --no-abbrevJeff King2017-01-071-0/+4
| * | blame: fix alignment with --abbrev=40Jeff King2017-01-071-0/+28
* | | Merge branch 'jk/archive-zip-userdiff-config' into maintJunio C Hamano2017-01-311-4/+18
|\ \ \
| * | | archive-zip: load userdiff configjk/archive-zip-userdiff-configJeff King2017-01-071-4/+18
| |/ /
* | | Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano2017-01-312-5/+28
|\ \ \
| * | | repack: die on incremental + write-bitmap-indexdt/disable-bitmap-in-auto-gcDavid Turner2016-12-291-5/+3
| * | | auto gc: don't write bitmaps for incremental repacksDavid Turner2016-12-291-0/+25
| |/ /
| * | Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-11-292-3/+18
| |\ \
| * \ \ Merge branch 'as/merge-attr-sleep' into maintJunio C Hamano2016-11-291-5/+13
| |\ \ \
| * \ \ \ Merge branch 'mm/send-email-cc-cruft-after-address' into maintJunio C Hamano2016-11-292-4/+33
| |\ \ \ \
| * \ \ \ \ Merge branch 'pb/test-parse-options-expect' into maintJunio C Hamano2016-10-281-170/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/tap-verbose-fix' into maintJunio C Hamano2016-10-282-4/+36
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-10-281-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-281-0/+99
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-281-0/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maintJunio C Hamano2016-10-281-0/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ref-symlink-loop' into maintJunio C Hamano2016-10-281-0/+5
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fast-import-notes-fix-new' into maintJunio C Hamano2017-01-311-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fast-import: properly fanout notes when tree is importedmh/fast-import-notes-fix-newMike Hommey2016-12-201-0/+42
* | | | | | | | | | | | | | Merge branch 'jc/compression-config' into maintJunio C Hamano2017-01-313-0/+140
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | compression: unify pack.compression configuration parsingjc/compression-configJunio C Hamano2016-11-153-0/+140
* | | | | | | | | | | | | | | Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-172-26/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t0021: fix flaky testls/filter-processLars Schneider2016-12-181-16/+1
| * | | | | | | | | | | | | | | docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-062-12/+16
* | | | | | | | | | | | | | | | Merge branch 'sb/t3600-cleanup' into maintJunio C Hamano2017-01-171-73/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t3600: slightly modernize stylesb/t3600-cleanupStefan Beller2016-12-121-73/+51
| * | | | | | | | | | | | | | | | t3600: remove useless redirectStefan Beller2016-12-051-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'sb/unpack-trees-grammofix' into maintJunio C Hamano2017-01-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofixStefan Beller2016-12-051-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'ls/t0021-fixup' into maintJunio C Hamano2017-01-171-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t0021: minor filter process test cleanupls/t0021-fixupLars Schneider2016-12-051-3/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2017-01-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktempJeff King2016-11-291-1/+2
* | | | | | | | | | | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-171-0/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | upload-pack: optionally allow fetching any sha1dt/smart-http-detect-server-going-awayDavid Turner2016-11-181-0/+22
| * | | | | | | | | | | | | | | | | | | | remote-curl: don't hang when a server dies before any outputDavid Turner2016-11-181-0/+30
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano2017-01-171-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | git-p4: fix multi-path changelist empty commitsgv/p4-multi-path-commit-fixGeorge Vanburgh2016-12-191-1/+21
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2017-01-171-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlinkLuke Diamand2016-12-181-0/+43
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-171-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | push: test pushing ambiguously named branchesjc/push-default-explicitDennis Kaarsemaker2016-10-311-0/+10
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-176-43/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t: use nongit() function where applicableJeff King2016-12-163-29/+5