summaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bp/mv-submodules-with-fsmonitor'Junio C Hamano2018-09-241-2/+1
|\
| * git-mv: allow submodules and fsmonitor to work togetherBen Peart2018-09-121-2/+1
* | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-1/+1
|\ \
| * | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
* | | Merge branch 'ds/reachable'Junio C Hamano2018-09-171-0/+1
|\ \ \
| * | | commit.h: remove method declarationsDerrick Stolee2018-07-201-0/+1
* | | | Revert "Merge branch 'sb/submodule-core-worktree'"Jonathan Nieder2018-09-071-14/+0
| |/ / |/| |
* | | submodule.c: use the right index instead of the_indexNguyễn Thái Ngọc Duy2018-08-131-4/+4
* | | dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy2018-08-131-1/+1
* | | Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-021-2/+2
|\ \ \ | |/ /
| * | commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-2/+2
* | | Merge branch 'sb/submodule-move-head-error-msg'Junio C Hamano2018-07-241-1/+1
|\ \ \
| * | | submodule.c: report the submodule that an error occurs inStefan Beller2018-06-251-1/+1
* | | | Merge branch 'sb/submodule-core-worktree'Junio C Hamano2018-07-181-0/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | submodule: unset core.worktree if no working tree is presentStefan Beller2018-06-141-0/+14
| | |/ | |/|
* | | submodule: fix NULL correctness in renamed broken submodulesStefan Beller2018-06-141-2/+4
|/ /
* | Merge branch 'jt/submodule-pull-recurse-rebase'Junio C Hamano2018-06-041-2/+4
|\ \
| * | submodule: do not pass null OID to setup_revisionsJonathan Tan2018-05-251-2/+4
* | | Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano2018-05-301-166/+2
|\ \ \
| * | | submodule.c: move submodule merging to merge-recursive.cStefan Beller2018-05-161-166/+2
* | | | Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano2018-05-301-10/+9
|\ \ \ \
| * | | | submodule: convert push_unpushed_submodules to take a struct refspecBrandon Williams2018-05-181-10/+9
| |/ / /
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-3/+3
|\ \ \ \
| * | | | submodule: convert several uses of EMPTY_TREE_SHA1_HEXbrian m. carlson2018-05-021-3/+3
* | | | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-4/+4
|\ \ \ \ \
| * | | | | Convert remaining die*(BUG) messagesJohannes Schindelin2018-05-061-1/+1
| * | | | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-3/+3
| |/ / / /
* | | | | Merge branch 'sb/oid-object-info'Junio C Hamano2018-05-231-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | cache.h: add repository argument to oid_object_infoStefan Beller2018-04-261-1/+1
| |/ / /
* | | | Merge branch 'sb/submodule-move-nested'Junio C Hamano2018-05-081-19/+21
|\ \ \ \ | |/ / / |/| | |
| * | | submodule: fixup nested submodules after moving the submodulesb/submodule-move-nestedStefan Beller2018-03-291-3/+3
| * | | submodule-config: remove submodule_from_cacheStefan Beller2018-03-291-2/+2
| * | | submodule-config: add repository argument to submodule_from_{name, path}Stefan Beller2018-03-291-14/+16
* | | | Merge branch 'sb/object-store'Junio C Hamano2018-04-111-0/+1
|\ \ \ \ | |/ / /
| * | | object-store: migrate alternates struct and functions from cache.hStefan Beller2018-03-231-0/+1
| | |/ | |/|
* | | sha1_file: convert sha1_object_info* to object_idbrian m. carlson2018-03-141-1/+1
* | | strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson2018-03-141-2/+2
| |/ |/|
* | submodule: rename 'new' variablesBrandon Williams2018-02-221-15/+15
* | object: rename function 'typename' to 'type_name'Brandon Williams2018-02-141-1/+1
|/
* submodule: submodule_move_head omits old argument in forced casesb/submodule-update-reset-fixStefan Beller2018-01-051-1/+3
* Merge branch 'bw/submodule-sans-cache-compat'Junio C Hamano2017-12-271-14/+18
|\
| * submodule: convert get_next_submodule to not rely on the_indexbw/submodule-sans-cache-compatBrandon Williams2017-12-121-10/+13
| * submodule: used correct index in is_staging_gitmodules_okBrandon Williams2017-12-121-2/+3
| * submodule: convert stage_updated_gitmodules to take a struct index_stateBrandon Williams2017-12-121-2/+2
* | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-1/+1
|\ \ | |/ |/|
| * Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* | Merge branch 'sb/submodule-recursive-checkout-detach-head'Junio C Hamano2017-12-061-1/+2
|\ \
| * | recursive submodules: detach HEAD from new stateStefan Beller2017-07-251-1/+2
* | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-211-1/+1
|\ \ \ | |_|/ |/| |
| * | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-011-1/+1
View Lorry Controller Status