summaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| * | reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller2017-05-301-6/+27
* | | Merge branch 'bw/pathspec-sans-the-index'Junio C Hamano2017-05-301-0/+63
|\ \ \
| * | | pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flagBrandon Williams2017-05-121-0/+33
| * | | submodule: add die_in_unpopulated_submodule functionBrandon Williams2017-05-101-0/+30
| | |/ | |/|
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-12/+12
|\ \ \
| * | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-7/+7
| * | | Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson2017-05-081-4/+4
| * | | submodule: convert merge_submodule to use struct object_idbrian m. carlson2017-05-081-12/+12
| |/ /
* | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2017-05-291-1/+2
|\ \ \
| * | | diff: recurse into nested submodules for inline diffjk/diff-submodule-diff-inlineStefan Beller2017-05-081-1/+2
* | | | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-05-291-10/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | submodule: properly recurse for read-tree and checkoutsb/checkout-recurse-submodulesStefan Beller2017-05-041-1/+2
| * | | submodule: avoid auto-discovery in new working tree manipulator codeStefan Beller2017-05-041-3/+3
| * | | submodule_move_head: reuse child_process structure for futher commandsStefan Beller2017-05-041-6/+6
| | |/ | |/|
* | | Merge branch 'sb/reset-recurse-submodules'Junio C Hamano2017-05-291-4/+27
|\ \ \
| * | | submodule.c: submodule_move_head works with broken submodulesStefan Beller2017-04-181-4/+24
| * | | submodule.c: uninitialized submodules are ignored in recursive commandsStefan Beller2017-04-181-0/+3
* | | | submodule: refactor logic to determine changed submodulesbw/submodule-has-commits-updateBrandon Williams2017-05-021-142/+105
* | | | submodule: improve submodule_has_commits()Brandon Williams2017-05-021-0/+34
* | | | submodule: change string_list changed_submodule_pathsBrandon Williams2017-05-011-2/+2
* | | | submodule: remove add_oid_to_argv()Brandon Williams2017-05-011-8/+2
* | | | submodule: rename free_submodules_sha1s()Brandon Williams2017-05-011-2/+3
* | | | submodule: rename add_sha1_to_array()Brandon Williams2017-05-011-4/+5
| |/ / |/| |
* | | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-04-231-2/+1
|\ \ \
| * | | submodule: remove a superfluous second check for the "new" variableSebastian Schuberth2017-04-171-2/+1
* | | | Merge branch 'nd/files-backend-git-dir'Junio C Hamano2017-04-191-0/+31
|\ \ \ \
| * | | | path.c: move some code out of strbuf_git_path_submodule()Nguyễn Thái Ngọc Duy2017-03-271-0/+31
* | | | | Merge branch 'sb/submodule-rm-absorb'Junio C Hamano2017-04-191-2/+2
|\ \ \ \ \
| * | | | | submodule.c: add missing ' in error messagesRalf Thielow2017-04-131-2/+2
* | | | | | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-04-191-4/+70
|\ \ \ \ \ \
| * | | | | | push: propagate remote and refspec with --recurse-submodulesBrandon Williams2017-04-111-3/+60
| * | | | | | push: propagate push-options with --recurse-submodulesBrandon Williams2017-04-111-2/+11
View Lorry Controller Status