summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* diff: add interhunk context config optionvn/diff-ihc-configVegard Nossum2017-01-121-1/+26
* Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-102-5/+116
|\
| * submodule: add absorb-git-dir functionStefan Beller2016-12-121-0/+101
| * test-lib-functions.sh: teach test_commit -C <dir>Stefan Beller2016-12-091-5/+15
* | Merge branch 'mh/fast-import-notes-fix-new'Junio C Hamano2017-01-101-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'Junio C Hamano2017-01-103-0/+140
|\ \ \
| * | | compression: unify pack.compression configuration parsingjc/compression-configJunio C Hamano2016-11-153-0/+140
* | | | Merge branch 'dt/smart-http-detect-server-going-away'Junio C Hamano2017-01-101-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 'ls/p4-lfs'Junio C Hamano2016-12-271-12/+12
|\ \ \ \
| * | | | git-p4: add diff/merge properties to .gitattributes for GitLFS filesls/p4-lfsLars Schneider2016-12-201-12/+12
* | | | | Merge branch 'lt/shortlog-by-committer'Junio C Hamano2016-12-271-0/+19
|\ \ \ \ \
| * | | | | t4201: make tests work with and without the MINGW prerequistelt/shortlog-by-committerJunio C Hamano2016-12-201-1/+7
| * | | | | shortlog: test and document --committer optionJeff King2016-12-161-0/+13
| | |_|/ / | |/| | |
* | | | | Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano2016-12-271-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'Junio C Hamano2016-12-271-0/+43
|\ \ \ \ \ \
| * | | | | | git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlinkLuke Diamand2016-12-181-0/+43
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-12-272-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 'bw/transport-protocol-policy'Junio C Hamano2016-12-275-11/+150
|\ \ \ \ \ \ \
| * | | | | | | http: respect protocol.*.allow=user for http-alternatesbw/transport-protocol-policyJeff King2016-12-151-0/+10
| * | | | | | | transport: add from_user parameter to is_transport_allowedBrandon Williams2016-12-151-0/+7
| * | | | | | | transport: add protocol policy config optionBrandon Williams2016-12-153-5/+127
| * | | | | | | lib-proto-disable: variable name fixBrandon Williams2016-12-141-6/+6
* | | | | | | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-271-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: ensure '--abort' option takes no argumentsChris Packham2016-12-141-0/+2
| * | | | | | | | merge: add '--continue' option as a synonym for 'git commit'Chris Packham2016-12-141-0/+9
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'va/i18n-perl-scripts'Junio C Hamano2016-12-271-1/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: add--interactive: mark patch prompt for translationVasco Almeida2016-12-141-1/+4
| * | | | | | | | i18n: add--interactive: mark plural stringsVasco Almeida2016-12-141-1/+10
* | | | | | | | | Merge branch 'sb/submodule-config-cleanup'Junio C Hamano2016-12-271-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule-config: rename commit_sha1 to treeish_nameStefan Beller2016-11-221-0/+14
* | | | | | | | | | Merge branch 'jc/push-default-explicit'Junio C Hamano2016-12-271-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'Junio C Hamano2016-12-216-43/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t: use nongit() function where applicableJeff King2016-12-163-29/+5
| * | | | | | | | | | | index-pack: complain when --stdin is used outside of a repoJeff King2016-12-161-0/+15
| * | | | | | | | | | | t5000: extract nongit function to test-lib-functions.shJeff King2016-12-162-14/+14
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/quote-env-path-list-component'Junio C Hamano2016-12-212-0/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5615-alternate-env: double-quotes in file names do not work on WindowsJohannes Sixt2016-12-211-1/+1
| * | | | | | | | | | | t5547-push-quarantine: run the path separator test on Windows, tooJohannes Sixt2016-12-131-4/+10
| * | | | | | | | | | | tmp-objdir: quote paths we add to alternatesJeff King2016-12-121-0/+19
| * | | | | | | | | | | alternates: accept double-quoted pathsJeff King2016-12-121-0/+18
| * | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-componentJunio C Hamano2016-12-121-0/+71
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vs/submodule-clone-nested-submodules-alternates'Junio C Hamano2016-12-211-0/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule--helper: set alternateLocation for cloned submodulesvs/submodule-clone-nested-submodules-alternatesVitaly "_Vi" Shukela2016-12-121-0/+66
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |