summaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-011-3/+3
* diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-4/+4
* diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-1/+1
* Merge branch 'sb/submodule-diff-header-fix'Junio C Hamano2017-10-031-1/+1
|\
| * submodule: correct error message for missing commitssb/submodule-diff-header-fixStefan Beller2017-09-281-1/+1
* | Merge branch 'hn/submodule-comment'Junio C Hamano2017-10-031-0/+4
|\ \
| * | submodule.c: describe submodule_to_gitdir() in a new commenthn/submodule-commentHan-Wen Nienhuys2017-09-261-0/+4
| |/
* | Merge branch 'ma/leakplugs'Junio C Hamano2017-09-291-2/+2
|\ \ | |/ |/|
| * object_array: use `object_array_clear()`, not `free()`Martin Ågren2017-09-241-2/+2
| * Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano2017-09-101-3/+15
| |\
* | \ Merge branch 'jn/per-repo-object-store-fixes'Junio C Hamano2017-09-251-8/+25
|\ \ \
| * | | push, fetch: error out for submodule entries not pointing to commitsStefan Beller2017-09-141-8/+25
* | | | Merge branch 'nd/prune-in-worktree'Junio C Hamano2017-09-191-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | revision.c: --all adds HEAD from all worktreesNguyễn Thái Ngọc Duy2017-08-241-0/+2
| * | | refs.c: move for_each_remote_ref_submodule() to submodule.cNguyễn Thái Ngọc Duy2017-08-241-0/+7
* | | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-95/+53
|\ \ \ \
| * | | | submodule: remove gitmodules_configBrandon Williams2017-08-031-15/+0
| * | | | submodule-config: move submodule-config functions to submodule-config.cBrandon Williams2017-08-031-35/+0
| * | | | submodule: remove submodule_config callback routineBrandon Williams2017-08-031-23/+2
| * | | | unpack-trees: don't respect submodule.updateBrandon Williams2017-08-031-1/+0
| * | | | submodule: don't rely on overlayed config when setting diffoptsBrandon Williams2017-08-031-2/+10
| * | | | fetch: don't overlay config with submodule-configBrandon Williams2017-08-031-7/+17
| * | | | submodule--helper: don't overlay config in update-cloneBrandon Williams2017-08-031-12/+26
| * | | | submodule: don't use submodule_from_nameBrandon Williams2017-08-021-2/+0
| * | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-021-16/+16
| |\ \ \ \
* | \ \ \ \ Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-261-47/+37
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | submodule.c: migrate diff output to use emit_diff_symbolStefan Beller2017-06-301-47/+37
* | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-221-90/+67
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | submodule: merge repo_read_gitmodules and gitmodules_configBrandon Williams2017-08-021-20/+17
| * | | | | submodule: check for unmerged .gitmodules outside of config parsingBrandon Williams2017-08-021-24/+23
| * | | | | submodule: check for unstaged .gitmodules outside of config parsingBrandon Williams2017-08-021-15/+17
| * | | | | submodule: remove fetch.recursesubmodules from submodule-config parsingBrandon Williams2017-08-021-13/+6
| * | | | | submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams2017-08-021-15/+1
| * | | | | cache.h: add GITMODULES_FILE macroBrandon Williams2017-08-021-10/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-08-221-3/+15
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodulesBrandon Williams2017-07-201-3/+15
* | | | | Merge branch 'bc/object-id'Junio C Hamano2017-08-111-16/+16
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | submodule: convert submodule config lookup to use object_idbrian m. carlson2017-07-171-16/+16
* | | | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-131-0/+26
|\ \ \ \ | |/ / / |/| | |
| * | | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-231-0/+26
* | | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-051-12/+23
|\ \ \ \
| * | | | submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-231-12/+8
| * | | | submodule: add repo_read_gitmodulesBrandon Williams2017-06-231-0/+15
| | | | |
| | \ \ \
| *-. \ \ \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-231-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | Spelling fixesvs/typofixesVille Skyttä2017-06-271-2/+2
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-131-9/+57
|\ \ \ \ | |_|/ / |/| | |
| * | | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-011-2/+21
| * | | submodule loading: separate code path for .gitmodules and config overlayStefan Beller2017-05-301-3/+11
View Lorry Controller Status