summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/mingw-test-push-unc-path'Junio C Hamano2017-01-191-0/+48
|\
| * mingw: add a regression test for pushing to UNC pathsJohannes Schindelin2017-01-071-0/+48
* | Merge branch 'km/branch-get-push-while-detached'Junio C Hamano2017-01-191-0/+6
|\ \
| * | branch_get_push: do not segfault when HEAD is detachedKyle Meyer2017-01-081-0/+6
* | | Merge branch 'jk/blame-fixes'Junio C Hamano2017-01-192-0/+149
|\ \ \
| * | | blame: output porcelain "previous" header for each fileJeff King2017-01-081-0/+117
| * | | blame: handle --no-abbrevJeff King2017-01-081-0/+4
| * | | blame: fix alignment with --abbrev=40Jeff King2017-01-081-0/+28
* | | | Merge branch 'jk/archive-zip-userdiff-config'Junio C Hamano2017-01-191-4/+18
|\ \ \ \
| * | | | archive-zip: load userdiff configJeff King2017-01-081-4/+18
| |/ / /
* | | | Merge branch 'dt/disable-bitmap-in-auto-gc'Junio C Hamano2017-01-192-5/+28
|\ \ \ \
| * | | | repack: die on incremental + write-bitmap-indexDavid 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 'sb/submodule-rm-absorb'Junio C Hamano2017-01-191-24/+15
|\ \ \ \ \ \ \
| * | | | | | | rm: absorb a submodules git dir before deletionStefan Beller2016-12-271-26/+17
* | | | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-191-0/+241
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: search history of moved submodulesBrandon Williams2016-12-221-0/+41
| * | | | | | | | grep: enable recurse-submodules to work on <tree> objectsBrandon Williams2016-12-221-1/+102
| * | | | | | | | grep: optionally recurse into submodulesBrandon Williams2016-12-221-0/+99
* | | | | | | | | Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-112-5/+116
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | submodule: add absorb-git-dir functionStefan Beller2016-12-131-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-111-0/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-import: properly fanout notes when tree is importedMike Hommey2016-12-201-0/+42
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/compression-config'Junio C Hamano2017-01-113-0/+140
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | compression: unify pack.compression configuration parsingJunio C Hamano2016-11-163-0/+140
* | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away'Junio C Hamano2017-01-111-0/+52
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | upload-pack: optionally allow fetching any sha1David 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 filesLars 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 prerequisteJunio 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 commitsGeorge 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 directoryLuke Diamand2016-12-181-0/+43
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-12-272-26/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t0021: fix flaky testLars 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-alternatesJeff 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-151-6/+6
* | | | | | | | | | | | | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-271-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \