summaryrefslogtreecommitdiff
path: root/submodule.c
AgeCommit message (Expand)AuthorFilesLines
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Libravatar Junio C Hamano1-2/+1
2012-08-03diff_setup_done(): return voidLibravatar Thomas Rast1-2/+1
2012-05-23Merge branch 'hv/submodule-alt-odb'Libravatar Junio C Hamano1-0/+3
2012-05-14teach add_submodule_odb() to look for alternatesLibravatar Heiko Voigt1-0/+3
2012-03-30push: teach --recurse-submodules the on-demand optionLibravatar Heiko Voigt1-0/+48
2012-03-30Refactor submodule push check to use string list instead of integerLibravatar Heiko Voigt1-12/+11
2012-03-30Teach revision walking machinery to walk multiple times sequenciallyLibravatar Heiko Voigt1-0/+2
2011-12-17submodule: use diff_tree_combined_merge() instead of diff_tree_combined()Libravatar René Scharfe1-11/+3
2011-12-17use struct sha1_array in diff_tree_combined()Libravatar René Scharfe1-9/+5
2011-12-13Merge branch 'jl/submodule-status-failure-report'Libravatar Junio C Hamano1-2/+2
2011-12-08diff/status: print submodule path when looking for changes failsLibravatar Jens Lehmann1-2/+2
2011-12-05Merge branch 'ab/clang-lints'Libravatar Junio C Hamano1-1/+1
2011-11-06cast variable in call to free() in builtin/diff.c and submodule.cLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-10-13submodule: Search for merges only at end of recursive mergeLibravatar Brad King1-1/+5
2011-10-05Merge branch 'jk/argv-array'Libravatar Junio C Hamano1-35/+6
2011-10-05Merge branch 'jk/maint-fetch-submodule-check-fix'Libravatar Junio C Hamano1-5/+72
2011-09-14refactor argv_array into generic codeLibravatar Jeff King1-35/+6
2011-09-12fetch: avoid quadratic loop checking for updated submodulesLibravatar Jeff King1-5/+72
2011-09-12Sync with 1.7.6.3Libravatar Junio C Hamano1-0/+4
2011-09-12Merge branch 'jl/maint-fetch-submodule-check-fix' into maintLibravatar Junio C Hamano1-0/+4
2011-09-09fetch: skip on-demand checking when no submodules are configuredLibravatar Jens Lehmann1-0/+4
2011-09-02Merge branch 'fg/submodule-ff-check-before-push'Libravatar Junio C Hamano1-0/+108
2011-08-28Merge branch 'nd/maint-clone-gitdir'Libravatar Junio C Hamano1-3/+3
2011-08-22read_gitfile_gently(): rename misnamed function to read_gitfile()Libravatar Junio C Hamano1-3/+3
2011-08-20push: Don't push a repository with unpushed submodulesLibravatar Fredrik Gustafsson1-0/+108
2011-08-01Merge branch 'jl/maint-fetch-recursive-fix' into maintLibravatar Junio C Hamano1-0/+1
2011-07-13Merge branch 'jl/maint-fetch-recursive-fix'Libravatar Junio C Hamano1-0/+1
2011-06-20fetch: Also fetch submodules in subdirectories in on-demand modeLibravatar Jens Lehmann1-0/+1
2011-05-14Submodules: Don't parse .gitmodules when it contains, merge conflictsLibravatar Jens Lehmann1-2/+29
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Libravatar Junio C Hamano1-12/+140
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-3/+3
2011-03-16diff --submodule: split into bite-sized piecesLibravatar Jonathan Nieder1-42/+61
2011-03-09fetch/pull: Don't recurse into a submodule when commits are already presentLibravatar Jens Lehmann1-1/+28
2011-03-09Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' optionLibravatar Jens Lehmann1-2/+7
2011-03-09config: teach the fetch.recurseSubmodules option the 'on-demand' valueLibravatar Jens Lehmann1-1/+1
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionLibravatar Jens Lehmann1-2/+6
2011-03-09fetch/pull: recurse into submodules when necessaryLibravatar Jens Lehmann1-7/+99
2010-12-09fetch_populated_submodules(): document dynamic allocationLibravatar Junio C Hamano1-1/+2
2010-11-12Submodules: Add the "fetchRecurseSubmodules" config optionLibravatar Jens Lehmann1-2/+18
2010-11-12Add the 'fetch.recurseSubmodules' config settingLibravatar Jens Lehmann1-1/+17
2010-11-12fetch/pull: Add the --recurse-submodules optionLibravatar Jens Lehmann1-1/+65
2010-08-21Merge branch 'hv/submodule-find-ff-merge'Libravatar Junio C Hamano1-0/+161
2010-08-09Add the 'diff.ignoreSubmodules' config settingLibravatar Johannes Schindelin1-0/+4
2010-08-09Submodules: Use "ignore" settings from .gitmodules too for diff and statusLibravatar Jens Lehmann1-0/+19
2010-08-09Submodules: Add the new "ignore" config option for diff and statusLibravatar Jens Lehmann1-1/+56
2010-07-07Implement automatic fast-forward merge for submodulesLibravatar Heiko Voigt1-0/+161
2010-06-25Add the option "--ignore-submodules" to "git status"Libravatar Jens Lehmann1-0/+13
2010-04-10Teach diff --submodule and status to handle .git files in submodulesLibravatar Jens Lehmann1-17/+16
2010-03-13git status: ignoring untracked files must apply to submodules tooLibravatar Jens Lehmann1-2/+7
2010-03-04git diff --submodule: Show detailed dirty status of submodulesLibravatar Jens Lehmann1-5/+35