summaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-2/+1
|\
| * diff_setup_done(): return voidThomas Rast2012-08-031-2/+1
* | Merge branch 'hv/submodule-alt-odb'Junio C Hamano2012-05-231-0/+3
|\ \
| * | teach add_submodule_odb() to look for alternatesHeiko Voigt2012-05-141-0/+3
| |/
* | push: teach --recurse-submodules the on-demand optionHeiko Voigt2012-03-301-0/+48
* | Refactor submodule push check to use string list instead of integerHeiko Voigt2012-03-301-12/+11
* | Teach revision walking machinery to walk multiple times sequenciallyHeiko Voigt2012-03-301-0/+2
|/
* submodule: use diff_tree_combined_merge() instead of diff_tree_combined()rs/diff-tree-combined-clean-upRené Scharfe2011-12-171-11/+3
* use struct sha1_array in diff_tree_combined()René Scharfe2011-12-171-9/+5
* Merge branch 'jl/submodule-status-failure-report'Junio C Hamano2011-12-131-2/+2
|\
| * diff/status: print submodule path when looking for changes failsjl/submodule-status-failure-reportJens Lehmann2011-12-081-2/+2
* | Merge branch 'ab/clang-lints'Junio C Hamano2011-12-051-1/+1
|\ \
| * | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lintsÆvar Arnfjörð Bjarmason2011-11-061-1/+1
* | | 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
View Lorry Controller Status