53 Commits (cb2912c324477f0d92618ac258c43b2692e870c4)

Author SHA1 Message Date
René Scharfe 78e98eaf5e submodule: use diff_tree_combined_merge() instead of diff_tree_combined() 13 years ago
René Scharfe 0041f09de6 use struct sha1_array in diff_tree_combined() 13 years ago
Jens Lehmann 6a5cedac87 diff/status: print submodule path when looking for changes fails 13 years ago
Ævar Arnfjörð Bjarmason 83838d5c1b cast variable in call to free() in builtin/diff.c and submodule.c 14 years ago
Brad King 80988783c8 submodule: Search for merges only at end of recursive merge 14 years ago
Jeff King c1189caeaf refactor argv_array into generic code 14 years ago
Jeff King 6859de45a9 fetch: avoid quadratic loop checking for updated submodules 14 years ago
Jens Lehmann 18322badc2 fetch: skip on-demand checking when no submodules are configured 14 years ago
Junio C Hamano 13d6ec9133 read_gitfile_gently(): rename misnamed function to read_gitfile() 14 years ago
Fredrik Gustafsson d2b17b3220 push: Don't push a repository with unpushed submodules 14 years ago
Jens Lehmann ea2d325b88 fetch: Also fetch submodules in subdirectories in on-demand mode 14 years ago
Jens Lehmann d4e98b581b Submodules: Don't parse .gitmodules when it contains, merge conflicts 14 years ago
Stephen Boyd c2e86addb8 Fix sparse warnings 14 years ago
Jonathan Nieder 808a95dcad diff --submodule: split into bite-sized pieces 14 years ago
Jens Lehmann c16c3e40b5 fetch/pull: Don't recurse into a submodule when commits are already present 14 years ago
Jens Lehmann bf42b38405 Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option 14 years ago
Jens Lehmann 1fb2550202 config: teach the fetch.recurseSubmodules option the 'on-demand' value 14 years ago
Jens Lehmann 8f0700dd33 fetch/pull: Add the 'on-demand' value to the --recurse-submodules option 14 years ago
Jens Lehmann 88a21979c5 fetch/pull: recurse into submodules when necessary 14 years ago
Junio C Hamano 1c1f3537c0 fetch_populated_submodules(): document dynamic allocation 14 years ago
Jens Lehmann c1a3c3640d Submodules: Add the "fetchRecurseSubmodules" config option 15 years ago
Jens Lehmann be254a0ea9 Add the 'fetch.recurseSubmodules' config setting 15 years ago
Jens Lehmann 7dce19d374 fetch/pull: Add the --recurse-submodules option 15 years ago
Johannes Schindelin be4f2b408e Add the 'diff.ignoreSubmodules' config setting 15 years ago
Jens Lehmann 302ad7a993 Submodules: Use "ignore" settings from .gitmodules too for diff and status 15 years ago
Jens Lehmann aee9c7d654 Submodules: Add the new "ignore" config option for diff and status 15 years ago
Heiko Voigt 68d03e4a6e Implement automatic fast-forward merge for submodules 15 years ago
Jens Lehmann 46a958b3da Add the option "--ignore-submodules" to "git status" 15 years ago
Jens Lehmann eee49b6ce4 Teach diff --submodule and status to handle .git files in submodules 15 years ago
Jens Lehmann 3bfc450476 git status: ignoring untracked files must apply to submodules too 15 years ago
Jens Lehmann c7e1a73641 git diff --submodule: Show detailed dirty status of submodules 15 years ago
Giuseppe Bilotta 5ce9086ddf is_submodule_modified(): clear environment properly 15 years ago
Jens Lehmann de7a79608c Fix memory leak in submodule.c 15 years ago
Junio C Hamano b0883aa6c7 is_submodule_modified(): fix breakage with external GIT_INDEX_FILE 15 years ago
Jens Lehmann 721ceec1ad Teach diff --submodule that modified submodule directory is dirty 15 years ago
Jens Lehmann ee6fc514f2 Show submodules as modified when they contain a dirty work tree 15 years ago
Junio C Hamano cb58c932a5 submodule.c: mark file-local function static 15 years ago
David Aguilar 75b9a8a6d5 submodule.c: Squelch a "use before assignment" warning 16 years ago
Johannes Schindelin 752c0c2492 Add the --submodule option to the diff option family 16 years ago