summaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/am-state-fix'Junio C Hamano2015-08-311-1/+1
|\
| * write_file(): drop caller-supplied LF from calls to create a one-liner filejc/am-state-fixJunio C Hamano2015-08-251-1/+1
| * write_file(): drop "fatal" parameterJunio C Hamano2015-08-241-1/+1
* | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-311-96/+26
|\ \ | |/ |/|
| * submodule: allow erroneous values for the fetchRecurseSubmodules optionhv/submodule-configHeiko Voigt2015-08-191-15/+0
| * submodule: use new config API for worktree configurationsHeiko Voigt2015-08-191-134/+26
| * submodule: extract functions for config set and lookupHeiko Voigt2015-08-191-45/+97
| * submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt2015-08-191-0/+1
* | convert "enum date_mode" into a structJeff King2015-06-291-1/+1
* | Merge branch 'bc/object-id'Junio C Hamano2015-06-051-3/+4
|\ \ | |/ |/|
| * submodule: rewrite to take an object_id argumentMichael Haggerty2015-05-251-15/+7
| * each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-251-3/+12
* | Merge branch 'rs/janitorial'Junio C Hamano2015-06-011-2/+1
|\ \ | |/ |/|
| * use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-201-2/+1
* | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-7/+2
|\ \ | |/ |/|
| * use new wrapper write_file() for simple file writingNguyễn Thái Ngọc Duy2014-12-011-7/+2
* | submodule: use capture_commandJeff King2015-03-221-3/+1
* | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-071-1/+1
|\ \ | |/ |/|
| * get_merge_bases(): always clean-up object flagsjc/merge-basesJunio C Hamano2014-10-301-1/+1
* | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-201-14/+7
* | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-231-4/+1
|\ \
| * | replace memset with string-list initializersta/string-list-initTanay Abhra2014-07-211-4/+1
| |/
* | submodule.c: use the ARRAY_SIZE macroep/submodule-code-cleanupElia Pinto2014-06-301-1/+1
|/
* Merge branch 'kb/fast-hashmap'Junio C Hamano2014-02-271-24/+1
|\
| * submodule: don't access the .gitmodules cache entry after removing itJens Lehmann2013-11-071-24/+1
* | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-1/+1
|/
* Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-0/+149
|\
| * rm: delete .gitmodules entry of submodules removed from the work treeJens Lehmann2013-08-061-0/+33
| * mv: update the path entry in .gitmodules for moved submodulesJens Lehmann2013-08-061-0/+34
| * submodule.c: add .gitmodules staging helper functionsJens Lehmann2013-07-301-0/+51
| * mv: move submodules using a gitfileJens Lehmann2013-07-301-0/+31
* | Merge branch 'jl/some-submodule-config-are-not-boolean'Junio C Hamano2013-09-041-0/+6
|\ \
| * | avoid segfault on submodule.*.path set to an empty "true"jl/some-submodule-config-are-not-booleanJharrod LaFon2013-08-191-0/+6
* | | 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