summaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* Sync with 2.22.2Johannes Schindelin2019-12-061-2/+47
|\
| * Sync with 2.21.1Johannes Schindelin2019-12-061-2/+47
| |\
| | * Sync with 2.20.2Johannes Schindelin2019-12-061-2/+47
| | |\
| | | * Sync with 2.19.3Johannes Schindelin2019-12-061-2/+47
| | | |\
| | | | * Sync with 2.18.2Johannes Schindelin2019-12-061-2/+47
| | | | |\
| | | | | * Sync with 2.17.3Johannes Schindelin2019-12-061-2/+47
| | | | | |\
| | | | | | * Sync with 2.16.6Johannes Schindelin2019-12-061-2/+47
| | | | | | |\
| | | | | | | * Sync with 2.15.4Johannes Schindelin2019-12-061-2/+47
| | | | | | | |\
| | | | | | | | * Sync with 2.14.6Johannes Schindelin2019-12-061-2/+47
| | | | | | | | |\
| | | | | | | | | * Disallow dubiously-nested submodule git directoriesJohannes Schindelin2019-12-051-2/+47
| | | | * | | | | | Merge branch 'sm/show-superproject-while-conflicted' into maintJunio C Hamano2018-11-211-1/+1
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'bp/mv-submodules-with-fsmonitor' into maintJunio C Hamano2018-11-211-2/+1
| | | | |\ \ \ \ \ \ \
* | | | | | | | | | | | submodule: drop unused prefix parameter from some functionsJeff King2019-05-131-6/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'bc/hash-transition-16'Junio C Hamano2019-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule: avoid hard-coded constantsbrian m. carlson2019-04-011-1/+1
* | | | | | | | | | | | Merge branch 'jt/submodule-fetch-errmsg'Junio C Hamano2019-04-101-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | submodule: explain first attempt failure clearlyJonathan Tan2019-03-141-0/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'nd/completion-more-parameters'Junio C Hamano2019-03-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | completion: add more parameter value completionNguyễn Thái Ngọc Duy2019-02-201-0/+4
| |/ / / / / / / / / /
* | | | | | | | | | | trace2: create new combined trace facilityJeff Hostetler2019-02-221-5/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-1/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sb/more-repo-in-api'Junio C Hamano2019-02-051-18/+60
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule: don't add submodule as odb for pushStefan Beller2018-12-281-3/+0
| * | | | | | | | | | submodule: use submodule repos for object lookupStefan Beller2018-12-281-15/+60
* | | | | | | | | | | Merge branch 'sb/submodule-recursive-fetch-gets-the-tip'Junio C Hamano2019-01-291-45/+239
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch: ensure submodule objects fetchedStefan Beller2018-12-091-29/+177
| * | | | | | | | | | | submodule.c: fetch in submodules git directory instead of in worktreeStefan Beller2018-12-051-2/+8
| * | | | | | | | | | | submodule: migrate get_next_submodule to use repository structsStefan Beller2018-12-051-12/+44
| * | | | | | | | | | | submodule: store OIDs in changed_submodule_namesStefan Beller2018-12-051-9/+10
| * | | | | | | | | | | submodule.c: tighten scope of changed_submodule_names structStefan Beller2018-12-051-8/+11
| * | | | | | | | | | | submodule.c: sort changed_submodule_names before searching itStefan Beller2018-12-051-1/+2
| * | | | | | | | | | | submodule.c: fix indentationStefan Beller2018-12-051-3/+6
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | submodule: unset core.worktree if no working tree is presentStefan Beller2018-12-261-0/+14
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ao/submodule-wo-gitmodules-checked-out'Junio C Hamano2018-11-131-7/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule: add a helper to check if it is safe to write to .gitmodulesAntonio Ospite2018-10-091-0/+18
| * | | | | | | | | | submodule: factor out a config_set_in_gitmodules_file_gently functionAntonio Ospite2018-10-091-7/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | submodule.c: remove some of the_repository referencesNguyễn Thái Ngọc Duy2018-10-221-25/+32
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'sm/show-superproject-while-conflicted'Junio C Hamano2018-10-191-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | rev-parse: --show-superproject-working-tree should work during a mergeSam McKelvie2018-09-281-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-14/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+3
| * | | | | | | | submodule.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-11/+17
| | |/ / / / / / | |/| | | | | |
* | | | | | | | 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
| |/ / / / / / |/| | | | | |