summaryrefslogtreecommitdiff
path: root/submodule.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jt/submodule-pull-recurse-rebase'Junio C Hamano2018-06-041-1/+4
|\
| * submodule: do not pass null OID to setup_revisionsJonathan Tan2018-05-251-1/+4
* | Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano2018-05-301-4/+2
|\ \
| * | submodule.c: move submodule merging to merge-recursive.cStefan Beller2018-05-161-4/+2
* | | submodule: convert push_unpushed_submodules to take a struct refspecBrandon Williams2018-05-181-1/+2
|/ /
* | Merge branch 'sb/submodule-move-nested'Junio C Hamano2018-05-081-1/+0
|\ \ | |/ |/|
| * submodule.h: drop declaration of connect_work_tree_and_git_dirStefan Beller2018-03-291-1/+0
* | submodule: rename 'new' variablesBrandon Williams2018-02-221-1/+1
|/
* submodule: convert get_next_submodule to not rely on the_indexbw/submodule-sans-cache-compatBrandon Williams2017-12-121-4/+6
* submodule: used correct index in is_staging_gitmodules_okBrandon Williams2017-12-121-1/+1
* submodule: convert stage_updated_gitmodules to take a struct index_stateBrandon Williams2017-12-121-1/+1
* Merge branch 'hn/typofix'Junio C Hamano2017-09-281-1/+1
|\
| * submodule.h: typofixhn/typofixHan-Wen Nienhuys2017-09-221-1/+1
* | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-5/+1
|\ \
| * | submodule: remove gitmodules_configBrandon Williams2017-08-031-2/+0
| * | submodule-config: move submodule-config functions to submodule-config.cBrandon Williams2017-08-031-2/+0
| * | submodule: remove submodule_config callback routineBrandon Williams2017-08-031-1/+0
| * | submodule--helper: don't overlay config in update-cloneBrandon Williams2017-08-031-0/+1
| * | Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-021-1/+1
| |\ \
* | \ \ Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-261-9/+4
|\ \ \ \
| * | | | submodule.c: migrate diff output to use emit_diff_symbolStefan Beller2017-06-301-9/+4
* | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-221-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | submodule: check for unmerged .gitmodules outside of config parsingBrandon Williams2017-08-021-0/+1
| * | | | submodule: check for unstaged .gitmodules outside of config parsingBrandon Williams2017-08-021-1/+1
| * | | | submodule: remove fetch.recursesubmodules from submodule-config parsingBrandon Williams2017-08-021-1/+1
| * | | | submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams2017-08-021-1/+0
| | |_|/ | |/| |
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-08-111-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | submodule: convert submodule config lookup to use object_idbrian m. carlson2017-07-171-1/+1
* | | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-131-0/+4
|\ \ \ | |/ / |/| |
| * | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-231-0/+4
| |/
* | submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-231-1/+1
* | submodule: add repo_read_gitmodulesBrandon Williams2017-06-231-0/+2
|/
* Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-131-1/+6
|\
| * Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-011-0/+1
| * reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller2017-05-301-1/+5
* | Merge branch 'bw/pathspec-sans-the-index'Junio C Hamano2017-05-301-0/+4
|\ \
| * | pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flagBrandon Williams2017-05-121-0/+2
| * | submodule: add die_in_unpopulated_submodule functionBrandon Williams2017-05-101-0/+2
| |/
* | submodule: convert merge_submodule to use struct object_idbrian m. carlson2017-05-081-4/+4
|/
* Merge branch 'nd/files-backend-git-dir'Junio C Hamano2017-04-191-0/+6
|\
| * path.c: move some code out of strbuf_git_path_submodule()Nguyễn Thái Ngọc Duy2017-03-271-0/+6
* | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-04-191-1/+4
|\ \
| * | push: propagate remote and refspec with --recurse-submodulesBrandon Williams2017-04-111-1/+3
| * | push: propagate push-options with --recurse-submodulesBrandon Williams2017-04-111-0/+1
* | | Merge branch 'bc/object-id'Junio C Hamano2017-04-191-4/+4
|\ \ \ | |/ / |/| |
| * | Rename sha1_array to oid_arraybrian m. carlson2017-03-311-3/+3
| * | submodule: convert check_for_new_submodule_commits to object_idbrian m. carlson2017-03-281-1/+1
| |/
* | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-03-281-1/+22
|\ \ | |/ |/|
| * update submodules: add submodule_move_headStefan Beller2017-03-161-0/+7
| * submodules: introduce check to see whether to touch a submoduleStefan Beller2017-03-151-0/+7
View Lorry Controller Status