summaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-221-1/+1
|\
| * Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-1/+1
* | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-121-0/+1
|\ \ | |/ |/|
| * pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-261-0/+1
* | Merge branch 'mh/reflife'Junio C Hamano2013-06-141-4/+2
|\ \ | |/ |/|
| * find_first_merges(): remove unnecessary codeMichael Haggerty2013-05-281-2/+1
| * find_first_merges(): initialize merges variable using initializerMichael Haggerty2013-05-281-2/+1
* | submodule: remove redundant check for the_index.initializedRené Scharfe2013-06-091-3/+2
|/
* submodule: print graph output next to submodule logJohn Keeping2013-04-051-4/+9
* submodule: clarify logic in show_submodule_summaryJeff King2013-03-221-7/+6
* submodule: simplify memory handling in config parsingJeff King2013-01-231-16/+14
* submodule: use parse_config_key when parsing configJeff King2013-01-231-9/+10
* submodule: display summary header in boldRamkumar Ramachandra2012-11-181-4/+4
* Merge branch 'jl/submodule-rm'Jeff King2012-10-291-0/+80
|\
| * submodule: teach rm to remove submodules unless they contain a git directoryJens Lehmann2012-09-291-0/+80
* | Merge branch 'jk/argv-array'Junio C Hamano2012-09-111-15/+16
|\ \
| * | submodule: use argv_array instead of hand-building arraysJens Lehmann2012-09-021-15/+16
* | | Merge branch 'jc/merge-bases'Junio C Hamano2012-09-111-6/+6
|\ \ \ | |_|/ |/| |
| * | in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-271-6/+6
* | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-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
View Lorry Controller Status