summaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* submodule: Search for merges only at end of recursive mergeBrad King2011-10-131-1/+5
* Merge branch 'jk/argv-array'Junio C Hamano2011-10-051-35/+6
|\
| * refactor argv_array into generic codeJeff King2011-09-141-35/+6
* | Merge branch 'jk/maint-fetch-submodule-check-fix'Junio C Hamano2011-10-051-5/+72
|\ \ | |/
| * fetch: avoid quadratic loop checking for updated submodulesJeff King2011-09-121-5/+72
* | Sync with 1.7.6.3Junio C Hamano2011-09-121-0/+4
|\ \
| * \ Merge branch 'jl/maint-fetch-submodule-check-fix' into maintJunio C Hamano2011-09-121-0/+4
| |\ \
| | * | fetch: skip on-demand checking when no submodules are configuredJens Lehmann2011-09-091-0/+4
| | |/
* | | Merge branch 'fg/submodule-ff-check-before-push'Junio C Hamano2011-09-021-0/+108
|\ \ \
| * | | push: Don't push a repository with unpushed submodulesFredrik Gustafsson2011-08-201-0/+108
| |/ /
| * | Merge branch 'jl/maint-fetch-recursive-fix' into maintJunio C Hamano2011-08-011-0/+1
| |\ \ | | |/ | |/|
* | | Merge branch 'nd/maint-clone-gitdir'Junio C Hamano2011-08-281-3/+3
|\ \ \
| * | | read_gitfile_gently(): rename misnamed function to read_gitfile()Junio C Hamano2011-08-221-3/+3
| |/ /
* | | Merge branch 'jl/maint-fetch-recursive-fix'Junio C Hamano2011-07-131-0/+1
|\ \ \ | |/ / |/| / | |/
| * fetch: Also fetch submodules in subdirectories in on-demand modeJens Lehmann2011-06-201-0/+1
* | Submodules: Don't parse .gitmodules when it contains, merge conflictsJens Lehmann2011-05-141-2/+29
|/
* Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-041-12/+140
|\
| * fetch/pull: Don't recurse into a submodule when commits are already presentJens Lehmann2011-03-091-1/+28
| * Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' optionJens Lehmann2011-03-091-2/+7
| * config: teach the fetch.recurseSubmodules option the 'on-demand' valueJens Lehmann2011-03-091-1/+1
| * fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann2011-03-091-2/+6
| * fetch/pull: recurse into submodules when necessaryJens Lehmann2011-03-091-7/+99
* | Fix sparse warningsStephen Boyd2011-03-221-3/+3
* | diff --submodule: split into bite-sized piecesJonathan Nieder2011-03-161-42/+61
|/
* fetch_populated_submodules(): document dynamic allocationJunio C Hamano2010-12-091-1/+2
* Submodules: Add the "fetchRecurseSubmodules" config optionJens Lehmann2010-11-121-2/+18
* Add the 'fetch.recurseSubmodules' config settingJens Lehmann2010-11-121-1/+17
* fetch/pull: Add the --recurse-submodules optionJens Lehmann2010-11-121-1/+65
* Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano2010-08-211-0/+161
|\
| * Implement automatic fast-forward merge for submodulesHeiko Voigt2010-07-071-0/+161
* | Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin2010-08-091-0/+4
* | Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann2010-08-091-0/+19
* | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-091-1/+56
|/
* Add the option "--ignore-submodules" to "git status"Jens Lehmann2010-06-251-0/+13
* Teach diff --submodule and status to handle .git files in submodulesJens Lehmann2010-04-101-17/+16
* git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-131-2/+7
* git diff --submodule: Show detailed dirty status of submodulesJens Lehmann2010-03-041-5/+35
* is_submodule_modified(): clear environment properlyGiuseppe Bilotta2010-02-241-11/+11
* Fix memory leak in submodule.cJens Lehmann2010-01-311-5/+9
* is_submodule_modified(): fix breakage with external GIT_INDEX_FILEv1.7.0-rc1Junio C Hamano2010-01-301-2/+5
* Teach diff --submodule that modified submodule directory is dirtyJens Lehmann2010-01-241-0/+3
* Merge branch 'jl/submodule-diff'Junio C Hamano2010-01-221-0/+49
|\
| * Show submodules as modified when they contain a dirty work treeJens Lehmann2010-01-161-0/+49
* | submodule.c: mark file-local function staticJunio C Hamano2010-01-121-1/+1
|/
* submodule.c: Squelch a "use before assignment" warningDavid Aguilar2009-11-201-1/+1
* fixup tr/stash-format mergeJunio C Hamano2009-10-301-2/+3
* Add the --submodule option to the diff option familyJohannes Schindelin2009-10-191-0/+113
View Lorry Controller Status