Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'jt/doc-pack-objects-fix' | Junio C Hamano | 2017-08-26 | 1 | -6/+11 | |
|\ \ \ \ | ||||||
| * | | | | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fix | Jonathan Tan | 2017-08-23 | 1 | -6/+11 | |
* | | | | | Merge branch 'jc/cutoff-config' | Junio C Hamano | 2017-08-26 | 5 | -31/+79 | |
|\ \ \ \ \ | ||||||
| * | | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-config | Junio C Hamano | 2017-08-22 | 5 | -12/+31 | |
| * | | | | | rerere: represent time duration in timestamp_t internally | Junio C Hamano | 2017-08-22 | 1 | -13/+23 | |
| * | | | | | t4200: parameterize "rerere gc" custom expiry test | Junio C Hamano | 2017-08-22 | 1 | -25/+33 | |
| * | | | | | t4200: gather "rerere gc" together | Junio C Hamano | 2017-08-22 | 1 | -27/+27 | |
| * | | | | | t4200: make "rerere gc" test more robust | Junio C Hamano | 2017-08-22 | 1 | -5/+14 | |
| * | | | | | t4200: give us a clean slate after "rerere gc" tests | Junio C Hamano | 2017-08-22 | 1 | -0/+2 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge branch 'kw/write-index-reduce-alloc' | Junio C Hamano | 2017-08-26 | 4 | -28/+87 | |
|\ \ \ \ \ | ||||||
| * | | | | | read-cache: avoid allocating every ondisk entry when writing | Kevin Willford | 2017-08-21 | 1 | -25/+25 | |
| * | | | | | read-cache: fix memory leak in do_write_index | Kevin Willford | 2017-08-21 | 1 | -3/+9 | |
| * | | | | | perf: add test for writing the index | Kevin Willford | 2017-08-21 | 3 | -0/+53 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'bw/submodule-config-cleanup' | Junio C Hamano | 2017-08-26 | 25 | -373/+192 | |
|\ \ \ \ \ | ||||||
| * | | | | | submodule: remove gitmodules_config | Brandon Williams | 2017-08-03 | 16 | -53/+0 | |
| * | | | | | unpack-trees: improve loading of .gitmodules | Brandon Williams | 2017-08-03 | 1 | -16/+27 | |
| * | | | | | submodule-config: lazy-load a repository's .gitmodules file | Brandon Williams | 2017-08-03 | 2 | -10/+22 | |
| * | | | | | submodule-config: move submodule-config functions to submodule-config.c | Brandon Williams | 2017-08-03 | 5 | -49/+34 | |
| * | | | | | submodule-config: remove support for overlaying repository config | Brandon Williams | 2017-08-03 | 3 | -79/+0 | |
| * | | | | | diff: stop allowing diff to have submodules configured in .git/config | Brandon Williams | 2017-08-03 | 2 | -70/+0 | |
| * | | | | | submodule: remove submodule_config callback routine | Brandon Williams | 2017-08-03 | 3 | -25/+2 | |
| * | | | | | unpack-trees: don't respect submodule.update | Brandon Williams | 2017-08-03 | 3 | -32/+9 | |
| * | | | | | submodule: don't rely on overlayed config when setting diffopts | Brandon Williams | 2017-08-03 | 1 | -2/+10 | |
| * | | | | | fetch: don't overlay config with submodule-config | Brandon Williams | 2017-08-03 | 2 | -8/+17 | |
| * | | | | | submodule--helper: don't overlay config in update-clone | Brandon Williams | 2017-08-03 | 3 | -16/+46 | |
| * | | | | | submodule--helper: don't overlay config in remote_submodule_branch | Brandon Williams | 2017-08-03 | 1 | -4/+11 | |
| * | | | | | add, reset: ensure submodules can be added or reset | Brandon Williams | 2017-08-02 | 2 | -0/+2 | |
| * | | | | | submodule: don't use submodule_from_name | Brandon Williams | 2017-08-02 | 1 | -2/+0 | |
| * | | | | | t7411: check configuration parsing errors | Brandon Williams | 2017-08-02 | 2 | -10/+15 | |
| * | | | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanup | Junio C Hamano | 2017-08-02 | 45 | -374/+366 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanup | Junio C Hamano | 2017-08-02 | 20 | -449/+246 | |
| |\ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ | Merge branch 'js/gitweb-raw-blob-link-in-history' | Junio C Hamano | 2017-08-26 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | gitweb: add 'raw' blob_plain link in history overviewjs/gitweb-raw-blob-link-in-history | Job Snijders | 2017-08-22 | 1 | -0/+3 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'po/object-id' | Junio C Hamano | 2017-08-26 | 9 | -34/+34 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | sha1_file: convert index_stream to struct object_id | Patryk Obara | 2017-08-20 | 1 | -3/+3 | |
| * | | | | | | | | sha1_file: convert hash_sha1_file_literally to struct object_id | Patryk Obara | 2017-08-20 | 3 | -6/+6 | |
| * | | | | | | | | sha1_file: convert index_fd to struct object_id | Patryk Obara | 2017-08-20 | 6 | -11/+11 | |
| * | | | | | | | | sha1_file: convert index_path to struct object_id | Patryk Obara | 2017-08-20 | 6 | -10/+10 | |
| * | | | | | | | | read-cache: convert to struct object_id | Patryk Obara | 2017-08-20 | 1 | -3/+3 | |
| * | | | | | | | | builtin/hash-object: convert to struct object_id | Patryk Obara | 2017-08-20 | 1 | -6/+6 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'jn/vcs-svn-cleanup' | Junio C Hamano | 2017-08-26 | 6 | -86/+56 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | vcs-svn: move remaining repo_tree functions to fast_export.hjn/vcs-svn-cleanup | Jonathan Nieder | 2017-08-23 | 6 | -55/+39 | |
| * | | | | | | | | vcs-svn: remove repo_delete wrapper function | Jonathan Nieder | 2017-08-23 | 3 | -8/+2 | |
| * | | | | | | | | vcs-svn: remove custom mode constants | Jonathan Nieder | 2017-08-23 | 4 | -21/+16 | |
| * | | | | | | | | vcs-svn: remove more unused prototypes and declarations | Jonathan Nieder | 2017-08-23 | 1 | -3/+0 | |
* | | | | | | | | | Merge branch 'bc/vcs-svn-cleanup' | Junio C Hamano | 2017-08-26 | 3 | -17/+10 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | vcs-svn: rename repo functions to "svn_repo"bc/vcs-svn-cleanup | brian m. carlson | 2017-08-20 | 3 | -10/+10 | |
| * | | | | | | | | vcs-svn: remove unused prototypes | brian m. carlson | 2017-08-20 | 1 | -7/+0 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'tb/apply-with-crlf' | Junio C Hamano | 2017-08-26 | 4 | -16/+71 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlf | Torsten Bögershausen | 2017-08-19 | 2 | -11/+63 |