| Commit message (Expand) | Author | Age | Files | Lines |
* | submodule: simplify memory handling in config parsing | Jeff King | 2013-01-23 | 1 | -16/+14 |
* | submodule: use parse_config_key when parsing config | Jeff King | 2013-01-23 | 1 | -9/+10 |
* | submodule: display summary header in bold | Ramkumar Ramachandra | 2012-11-18 | 1 | -4/+4 |
* | Merge branch 'jl/submodule-rm' | Jeff King | 2012-10-29 | 1 | -0/+80 |
|\ |
|
| * | submodule: teach rm to remove submodules unless they contain a git directory | Jens Lehmann | 2012-09-29 | 1 | -0/+80 |
* | | Merge branch 'jk/argv-array' | Junio C Hamano | 2012-09-11 | 1 | -15/+16 |
|\ \ |
|
| * | | submodule: use argv_array instead of hand-building arrays | Jens Lehmann | 2012-09-02 | 1 | -15/+16 |
* | | | Merge branch 'jc/merge-bases' | Junio C Hamano | 2012-09-11 | 1 | -6/+6 |
|\ \ \
| |_|/
|/| | |
|
| * | | in_merge_bases(): support only one "other" commit | Junio C Hamano | 2012-08-27 | 1 | -6/+6 |
* | | | Merge branch 'tr/void-diff-setup-done' | Junio C Hamano | 2012-08-22 | 1 | -2/+1 |
|\ \ \ |
|
| * | | | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 1 | -2/+1 |
| |/ / |
|
* | | | Merge branch 'hv/submodule-alt-odb' | Junio C Hamano | 2012-05-23 | 1 | -0/+3 |
|\ \ \
| |_|/
|/| | |
|
| * | | teach add_submodule_odb() to look for alternates | Heiko Voigt | 2012-05-14 | 1 | -0/+3 |
| |/ |
|
* | | push: teach --recurse-submodules the on-demand option | Heiko Voigt | 2012-03-30 | 1 | -0/+48 |
* | | Refactor submodule push check to use string list instead of integer | Heiko Voigt | 2012-03-30 | 1 | -12/+11 |
* | | Teach revision walking machinery to walk multiple times sequencially | Heiko Voigt | 2012-03-30 | 1 | -0/+2 |
|/ |
|
* | submodule: use diff_tree_combined_merge() instead of diff_tree_combined()rs/diff-tree-combined-clean-up | René Scharfe | 2011-12-17 | 1 | -11/+3 |
* | use struct sha1_array in diff_tree_combined() | René Scharfe | 2011-12-17 | 1 | -9/+5 |
* | Merge branch 'jl/submodule-status-failure-report' | Junio C Hamano | 2011-12-13 | 1 | -2/+2 |
|\ |
|
| * | diff/status: print submodule path when looking for changes failsjl/submodule-status-failure-report | Jens Lehmann | 2011-12-08 | 1 | -2/+2 |
* | | Merge branch 'ab/clang-lints' | Junio C Hamano | 2011-12-05 | 1 | -1/+1 |
|\ \ |
|
| * | | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lints | Ævar Arnfjörð Bjarmason | 2011-11-06 | 1 | -1/+1 |
* | | | submodule: Search for merges only at end of recursive merge | Brad King | 2011-10-13 | 1 | -1/+5 |
* | | | Merge branch 'jk/argv-array' | Junio C Hamano | 2011-10-05 | 1 | -35/+6 |
|\ \ \ |
|
| * | | | refactor argv_array into generic code | Jeff King | 2011-09-14 | 1 | -35/+6 |
* | | | | Merge branch 'jk/maint-fetch-submodule-check-fix' | Junio C Hamano | 2011-10-05 | 1 | -5/+72 |
|\ \ \ \
| |/ / /
| | / /
| |/ /
|/| | |
|
| * | | fetch: avoid quadratic loop checking for updated submodules | Jeff King | 2011-09-12 | 1 | -5/+72 |
* | | | Sync with 1.7.6.3 | Junio C Hamano | 2011-09-12 | 1 | -0/+4 |
|\ \ \ |
|
| * \ \ | Merge branch 'jl/maint-fetch-submodule-check-fix' into maint | Junio C Hamano | 2011-09-12 | 1 | -0/+4 |
| |\ \ \ |
|
| | * | | | fetch: skip on-demand checking when no submodules are configured | Jens Lehmann | 2011-09-09 | 1 | -0/+4 |
| | |/ / |
|
* | | | | Merge branch 'fg/submodule-ff-check-before-push' | Junio C Hamano | 2011-09-02 | 1 | -0/+108 |
|\ \ \ \ |
|
| * | | | | push: Don't push a repository with unpushed submodules | Fredrik Gustafsson | 2011-08-20 | 1 | -0/+108 |
| |/ / / |
|
| * | | | Merge branch 'jl/maint-fetch-recursive-fix' into maint | Junio C Hamano | 2011-08-01 | 1 | -0/+1 |
| |\ \ \
| | |/ /
| |/| | |
|
* | | | | Merge branch 'nd/maint-clone-gitdir' | Junio C Hamano | 2011-08-28 | 1 | -3/+3 |
|\ \ \ \ |
|
| * | | | | read_gitfile_gently(): rename misnamed function to read_gitfile() | Junio C Hamano | 2011-08-22 | 1 | -3/+3 |
| |/ / / |
|
* | | | | Merge branch 'jl/maint-fetch-recursive-fix' | Junio C Hamano | 2011-07-13 | 1 | -0/+1 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | fetch: Also fetch submodules in subdirectories in on-demand mode | Jens Lehmann | 2011-06-20 | 1 | -0/+1 |
* | | | Submodules: Don't parse .gitmodules when it contains, merge conflicts | Jens Lehmann | 2011-05-14 | 1 | -2/+29 |
|/ / |
|
* | | Merge branch 'jl/submodule-fetch-on-demand' | Junio C Hamano | 2011-04-04 | 1 | -12/+140 |
|\ \ |
|
| * | | fetch/pull: Don't recurse into a submodule when commits are already present | Jens Lehmann | 2011-03-09 | 1 | -1/+28 |
| * | | Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option | Jens Lehmann | 2011-03-09 | 1 | -2/+7 |
| * | | config: teach the fetch.recurseSubmodules option the 'on-demand' value | Jens Lehmann | 2011-03-09 | 1 | -1/+1 |
| * | | fetch/pull: Add the 'on-demand' value to the --recurse-submodules option | Jens Lehmann | 2011-03-09 | 1 | -2/+6 |
| * | | fetch/pull: recurse into submodules when necessary | Jens Lehmann | 2011-03-09 | 1 | -7/+99 |
* | | | Fix sparse warnings | Stephen Boyd | 2011-03-22 | 1 | -3/+3 |
* | | | diff --submodule: split into bite-sized pieces | Jonathan Nieder | 2011-03-16 | 1 | -42/+61 |
|/ / |
|
* | | fetch_populated_submodules(): document dynamic allocation | Junio C Hamano | 2010-12-09 | 1 | -1/+2 |
* | | Submodules: Add the "fetchRecurseSubmodules" config option | Jens Lehmann | 2010-11-12 | 1 | -2/+18 |
* | | Add the 'fetch.recurseSubmodules' config setting | Jens Lehmann | 2010-11-12 | 1 | -1/+17 |
* | | fetch/pull: Add the --recurse-submodules option | Jens Lehmann | 2010-11-12 | 1 | -1/+65 |