summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'jt/doc-pack-objects-fix'Junio C Hamano2017-08-261-6/+11
|\ \ \ \
| * | | | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fixJonathan Tan2017-08-231-6/+11
* | | | | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-265-31/+79
|\ \ \ \ \
| * | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-configJunio C Hamano2017-08-225-12/+31
| * | | | | rerere: represent time duration in timestamp_t internallyJunio C Hamano2017-08-221-13/+23
| * | | | | t4200: parameterize "rerere gc" custom expiry testJunio C Hamano2017-08-221-25/+33
| * | | | | t4200: gather "rerere gc" togetherJunio C Hamano2017-08-221-27/+27
| * | | | | t4200: make "rerere gc" test more robustJunio C Hamano2017-08-221-5/+14
| * | | | | t4200: give us a clean slate after "rerere gc" testsJunio C Hamano2017-08-221-0/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'kw/write-index-reduce-alloc'Junio C Hamano2017-08-264-28/+87
|\ \ \ \ \
| * | | | | read-cache: avoid allocating every ondisk entry when writingKevin Willford2017-08-211-25/+25
| * | | | | read-cache: fix memory leak in do_write_indexKevin Willford2017-08-211-3/+9
| * | | | | perf: add test for writing the indexKevin Willford2017-08-213-0/+53
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-2625-373/+192
|\ \ \ \ \
| * | | | | submodule: remove gitmodules_configBrandon Williams2017-08-0316-53/+0
| * | | | | unpack-trees: improve loading of .gitmodulesBrandon Williams2017-08-031-16/+27
| * | | | | submodule-config: lazy-load a repository's .gitmodules fileBrandon Williams2017-08-032-10/+22
| * | | | | submodule-config: move submodule-config functions to submodule-config.cBrandon Williams2017-08-035-49/+34
| * | | | | submodule-config: remove support for overlaying repository configBrandon Williams2017-08-033-79/+0
| * | | | | diff: stop allowing diff to have submodules configured in .git/configBrandon Williams2017-08-032-70/+0
| * | | | | submodule: remove submodule_config callback routineBrandon Williams2017-08-033-25/+2
| * | | | | unpack-trees: don't respect submodule.updateBrandon Williams2017-08-033-32/+9
| * | | | | submodule: don't rely on overlayed config when setting diffoptsBrandon Williams2017-08-031-2/+10
| * | | | | fetch: don't overlay config with submodule-configBrandon Williams2017-08-032-8/+17
| * | | | | submodule--helper: don't overlay config in update-cloneBrandon Williams2017-08-033-16/+46
| * | | | | submodule--helper: don't overlay config in remote_submodule_branchBrandon Williams2017-08-031-4/+11
| * | | | | add, reset: ensure submodules can be added or resetBrandon Williams2017-08-022-0/+2
| * | | | | submodule: don't use submodule_from_nameBrandon Williams2017-08-021-2/+0
| * | | | | t7411: check configuration parsing errorsBrandon Williams2017-08-022-10/+15
| * | | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-0245-374/+366
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanupJunio C Hamano2017-08-0220-449/+246
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'js/gitweb-raw-blob-link-in-history'Junio C Hamano2017-08-261-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: add 'raw' blob_plain link in history overviewjs/gitweb-raw-blob-link-in-historyJob Snijders2017-08-221-0/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'po/object-id'Junio C Hamano2017-08-269-34/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1_file: convert index_stream to struct object_idPatryk Obara2017-08-201-3/+3
| * | | | | | | | sha1_file: convert hash_sha1_file_literally to struct object_idPatryk Obara2017-08-203-6/+6
| * | | | | | | | sha1_file: convert index_fd to struct object_idPatryk Obara2017-08-206-11/+11
| * | | | | | | | sha1_file: convert index_path to struct object_idPatryk Obara2017-08-206-10/+10
| * | | | | | | | read-cache: convert to struct object_idPatryk Obara2017-08-201-3/+3
| * | | | | | | | builtin/hash-object: convert to struct object_idPatryk Obara2017-08-201-6/+6
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/vcs-svn-cleanup'Junio C Hamano2017-08-266-86/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | vcs-svn: move remaining repo_tree functions to fast_export.hjn/vcs-svn-cleanupJonathan Nieder2017-08-236-55/+39
| * | | | | | | | vcs-svn: remove repo_delete wrapper functionJonathan Nieder2017-08-233-8/+2
| * | | | | | | | vcs-svn: remove custom mode constantsJonathan Nieder2017-08-234-21/+16
| * | | | | | | | vcs-svn: remove more unused prototypes and declarationsJonathan Nieder2017-08-231-3/+0
* | | | | | | | | Merge branch 'bc/vcs-svn-cleanup'Junio C Hamano2017-08-263-17/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | vcs-svn: rename repo functions to "svn_repo"bc/vcs-svn-cleanupbrian m. carlson2017-08-203-10/+10
| * | | | | | | | vcs-svn: remove unused prototypesbrian m. carlson2017-08-201-7/+0
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'tb/apply-with-crlf'Junio C Hamano2017-08-264-16/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlfTorsten Bögershausen2017-08-192-11/+63