summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | ewah: drop ewah_deserialize functionJeff King2018-06-182-56/+0
| * | | | | | | | ewah_io: delete unused 'ewah_serialize()'Derrick Stolee2018-06-182-11/+0
| * | | | | | | | ewah_bitmap: delete unused 'ewah_or()'Derrick Stolee2018-06-182-74/+0
| * | | | | | | | ewah_bitmap: delete unused 'ewah_not()'Derrick Stolee2018-06-182-26/+0
| * | | | | | | | ewah_bitmap: delete unused 'ewah_and_not()'Derrick Stolee2018-06-182-78/+0
| * | | | | | | | ewah_bitmap: delete unused 'ewah_and()'Derrick Stolee2018-06-182-73/+0
| * | | | | | | | ewah/bitmap.c: delete unused 'bitmap_each_bit()'Derrick Stolee2018-06-182-25/+0
| * | | | | | | | ewah/bitmap.c: delete unused 'bitmap_clear()'Derrick Stolee2018-06-182-9/+0
* | | | | | | | | Merge branch 'sb/submodule-core-worktree'Junio C Hamano2018-07-186-2/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule deinit: unset core.worktreeStefan Beller2018-06-193-1/+8
| * | | | | | | | | submodule: ensure core.worktree is set after updateStefan Beller2018-06-192-0/+29
| * | | | | | | | | submodule: unset core.worktree if no working tree is presentStefan Beller2018-06-143-1/+18
* | | | | | | | | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-1895-328/+463
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: allow lookup_commit_graft to handle arbitrary repositoriesStefan Beller2018-05-182-6/+5
| * | | | | | | | | | commit: allow prepare_commit_graft to handle arbitrary repositoriesStefan Beller2018-05-182-8/+8
| * | | | | | | | | | shallow: migrate shallow information into the object parserStefan Beller2018-05-184-33/+33
| * | | | | | | | | | path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-1815-101/+135
| * | | | | | | | | | cache: convert get_graft_file to handle arbitrary repositoriesStefan Beller2018-05-183-5/+5
| * | | | | | | | | | commit: convert read_graft_file to handle arbitrary repositoriesBrandon Williams2018-05-181-3/+2
| * | | | | | | | | | commit: convert register_commit_graft to handle arbitrary repositoriesBrandon Williams2018-05-182-16/+16
| * | | | | | | | | | commit: convert commit_graft_pos() to handle arbitrary repositoriesBrandon Williams2018-05-181-4/+3
| * | | | | | | | | | shallow: add repository argument to is_repository_shallowStefan Beller2018-05-1810-17/+19
| * | | | | | | | | | shallow: add repository argument to check_shallow_file_for_updateStefan Beller2018-05-181-3/+4
| * | | | | | | | | | shallow: add repository argument to register_shallowStefan Beller2018-05-186-9/+11
| * | | | | | | | | | shallow: add repository argument to set_alternate_shallow_fileStefan Beller2018-05-184-4/+5
| * | | | | | | | | | commit: add repository argument to lookup_commit_graftJonathan Nieder2018-05-184-6/+8
| * | | | | | | | | | commit: add repository argument to prepare_commit_graftJonathan Nieder2018-05-161-2/+3
| * | | | | | | | | | commit: add repository argument to read_graft_fileJonathan Nieder2018-05-161-2/+3
| * | | | | | | | | | commit: add repository argument to register_commit_graftJonathan Nieder2018-05-164-5/+8
| * | | | | | | | | | commit: add repository argument to commit_graft_posJonathan Nieder2018-05-161-4/+5
| * | | | | | | | | | object: move grafts to object parserJonathan Nieder2018-05-162-19/+27
| * | | | | | | | | | object-store: move object access functions to object-store.hStefan Beller2018-05-1679-117/+198
* | | | | | | | | | | Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2018-07-181-82/+104
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: add pointer about unduly complex looking codeElijah Newren2018-06-121-0/+15
| * | | | | | | | | | | merge-recursive: rename conflict_rename_*() family of functionsElijah Newren2018-06-121-43/+43
| * | | | | | | | | | | merge-recursive: clarify the rename_dir/RENAME_DIR meaningElijah Newren2018-06-121-11/+17
| * | | | | | | | | | | merge-recursive: align labels with their respective code blocksElijah Newren2018-06-121-3/+3
| * | | | | | | | | | | merge-recursive: fix numerous argument alignment issuesElijah Newren2018-06-121-37/+38
| * | | | | | | | | | | merge-recursive: fix miscellaneous grammar error in commentElijah Newren2018-06-121-1/+1
* | | | | | | | | | | | Second batch for 2.19 cycleJunio C Hamano2018-06-281-0/+44
* | | | | | | | | | | | Merge branch 'sb/fix-fetching-moved-submodules'Junio C Hamano2018-06-282-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5526: test recursive submodules when fetching moved submodulesStefan Beller2018-06-141-5/+1
| * | | | | | | | | | | | submodule: fix NULL correctness in renamed broken submodulesStefan Beller2018-06-141-2/+4
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tz/cred-netrc-cleanup'Junio C Hamano2018-06-283-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-credential-netrc: make "all" default target of MakefileTodd Zullinger2018-06-181-0/+3
| * | | | | | | | | | | | git-credential-netrc: fix exit status when tests failLuis Marsano2018-06-181-1/+3
| * | | | | | | | | | | | git-credential-netrc: use in-tree Git.pm for testsLuis Marsano2018-06-182-2/+2
| * | | | | | | | | | | | git-credential-netrc: minor whitespace cleanup in test scriptTodd Zullinger2018-06-181-4/+4
* | | | | | | | | | | | | Merge branch 'jc/clean-after-sanity-tests'Junio C Hamano2018-06-285-9/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tests: clean after SANITY testsJunio C Hamano2018-06-155-9/+6
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |