aboutsummaryrefslogtreecommitdiffstats
path: root/submodule.c
AgeCommit message (Expand)AuthorFilesLines
2012-11-18submodule: display summary header in boldRamkumar Ramachandra1-4/+4
2012-10-29Merge branch 'jl/submodule-rm'Jeff King1-0/+80
2012-09-29submodule: teach rm to remove submodules unless they contain a git directoryJens Lehmann1-0/+80
2012-09-11Merge branch 'jk/argv-array'Junio C Hamano1-15/+16
2012-09-11Merge branch 'jc/merge-bases'Junio C Hamano1-6/+6
2012-09-02submodule: use argv_array instead of hand-building arraysJens Lehmann1-15/+16
2012-08-27in_merge_bases(): support only one "other" commitJunio C Hamano1-6/+6
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-2/+1
2012-08-03diff_setup_done(): return voidThomas Rast1-2/+1
2012-05-23Merge branch 'hv/submodule-alt-odb'Junio C Hamano1-0/+3
2012-05-14teach add_submodule_odb() to look for alternatesHeiko Voigt1-0/+3
2012-03-30push: teach --recurse-submodules the on-demand optionHeiko Voigt1-0/+48
2012-03-30Refactor submodule push check to use string list instead of integerHeiko Voigt1-12/+11
2012-03-30Teach revision walking machinery to walk multiple times sequenciallyHeiko Voigt1-0/+2
2011-12-17submodule: use diff_tree_combined_merge() instead of diff_tree_combined()René Scharfe1-11/+3
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe1-9/+5
2011-12-13Merge branch 'jl/submodule-status-failure-report'Junio C Hamano1-2/+2
2011-12-08diff/status: print submodule path when looking for changes failsJens Lehmann1-2/+2
2011-12-05Merge branch 'ab/clang-lints'Junio C Hamano1-1/+1
2011-11-06cast variable in call to free() in builtin/diff.c and submodule.cÆvar Arnfjörð Bjarmason1-1/+1
2011-10-13submodule: Search for merges only at end of recursive mergeBrad King1-1/+5
2011-10-05Merge branch 'jk/argv-array'Junio C Hamano1-35/+6
2011-10-05Merge branch 'jk/maint-fetch-submodule-check-fix'Junio C Hamano1-5/+72
2011-09-14refactor argv_array into generic codeJeff King1-35/+6
2011-09-12fetch: avoid quadratic loop checking for updated submodulesJeff King1-5/+72
2011-09-12Sync with 1.7.6.3Junio C Hamano1-0/+4
2011-09-12Merge branch 'jl/maint-fetch-submodule-check-fix' into maintJunio C Hamano1-0/+4
2011-09-09fetch: skip on-demand checking when no submodules are configuredJens Lehmann1-0/+4
2011-09-02Merge branch 'fg/submodule-ff-check-before-push'Junio C Hamano1-0/+108
2011-08-28Merge branch 'nd/maint-clone-gitdir'Junio C Hamano1-3/+3
2011-08-22read_gitfile_gently(): rename misnamed function to read_gitfile()Junio C Hamano1-3/+3
2011-08-20push: Don't push a repository with unpushed submodulesFredrik Gustafsson1-0/+108
2011-08-01Merge branch 'jl/maint-fetch-recursive-fix' into maintJunio C Hamano1-0/+1
2011-07-13Merge branch 'jl/maint-fetch-recursive-fix'Junio C Hamano1-0/+1
2011-06-20fetch: Also fetch submodules in subdirectories in on-demand modeJens Lehmann1-0/+1
2011-05-14Submodules: Don't parse .gitmodules when it contains, merge conflictsJens Lehmann1-2/+29
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano1-12/+140
2011-03-22Fix sparse warningsStephen Boyd1-3/+3
2011-03-16diff --submodule: split into bite-sized piecesJonathan Nieder1-42/+61
2011-03-09fetch/pull: Don't recurse into a submodule when commits are already presentJens Lehmann1-1/+28
2011-03-09Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' optionJens Lehmann1-2/+7
2011-03-09config: teach the fetch.recurseSubmodules option the 'on-demand' valueJens Lehmann1-1/+1
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann1-2/+6
2011-03-09fetch/pull: recurse into submodules when necessaryJens Lehmann1-7/+99
2010-12-09fetch_populated_submodules(): document dynamic allocationJunio C Hamano1-1/+2
2010-11-12Submodules: Add the "fetchRecurseSubmodules" config optionJens Lehmann1-2/+18
2010-11-12Add the 'fetch.recurseSubmodules' config settingJens Lehmann1-1/+17
2010-11-12fetch/pull: Add the --recurse-submodules optionJens Lehmann1-1/+65
2010-08-21Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano1-0/+161
2010-08-09Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin1-0/+4
2010-08-09Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann1-0/+19
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann1-1/+56
2010-07-07Implement automatic fast-forward merge for submodulesHeiko Voigt1-0/+161
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann1-0/+13
2010-04-10Teach diff --submodule and status to handle .git files in submodulesJens Lehmann1-17/+16
2010-03-13git status: ignoring untracked files must apply to submodules tooJens Lehmann1-2/+7
2010-03-04git diff --submodule: Show detailed dirty status of submodulesJens Lehmann1-5/+35
2010-02-24is_submodule_modified(): clear environment properlyGiuseppe Bilotta1-11/+11
2010-01-31Fix memory leak in submodule.cJens Lehmann1-5/+9
2010-01-30is_submodule_modified(): fix breakage with external GIT_INDEX_FILEv1.7.0-rc1Junio C Hamano1-2/+5
2010-01-24Teach diff --submodule that modified submodule directory is dirtyJens Lehmann1-0/+3
2010-01-22Merge branch 'jl/submodule-diff'Junio C Hamano1-0/+49
2010-01-16Show submodules as modified when they contain a dirty work treeJens Lehmann1-0/+49
2010-01-12submodule.c: mark file-local function staticJunio C Hamano1-1/+1
2009-11-20submodule.c: Squelch a "use before assignment" warningDavid Aguilar1-1/+1
2009-10-30fixup tr/stash-format mergeJunio C Hamano1-2/+3
2009-10-19Add the --submodule option to the diff option familyJohannes Schindelin1-0/+113