aboutsummaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAge
* Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-26
|\
| * submodule: remove gitmodules_configBrandon Williams2017-08-03
| * submodule-config: move submodule-config functions to submodule-config.cBrandon Williams2017-08-03
| * submodule: remove submodule_config callback routineBrandon Williams2017-08-03
| * unpack-trees: don't respect submodule.updateBrandon Williams2017-08-03
| * submodule: don't rely on overlayed config when setting diffoptsBrandon Williams2017-08-03
| * fetch: don't overlay config with submodule-configBrandon Williams2017-08-03
| * submodule--helper: don't overlay config in update-cloneBrandon Williams2017-08-03
| * submodule: don't use submodule_from_nameBrandon Williams2017-08-02
| * Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-02
| |\
* | \ Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-26
|\ \ \
| * | | submodule.c: migrate diff output to use emit_diff_symbolStefan Beller2017-06-30
* | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-22
|\ \ \ \ | | |/ / | |/| |
| * | | submodule: merge repo_read_gitmodules and gitmodules_configBrandon Williams2017-08-02
| * | | submodule: check for unmerged .gitmodules outside of config parsingBrandon Williams2017-08-02
| * | | submodule: check for unstaged .gitmodules outside of config parsingBrandon Williams2017-08-02
| * | | submodule: remove fetch.recursesubmodules from submodule-config parsingBrandon Williams2017-08-02
| * | | submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams2017-08-02
| * | | cache.h: add GITMODULES_FILE macroBrandon Williams2017-08-02
* | | | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-08-22
|\ \ \ \
| * | | | submodule--helper: teach push-check to handle HEADBrandon Williams2017-07-20
* | | | | Merge branch 'bc/object-id'Junio C Hamano2017-08-11
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | submodule: convert submodule config lookup to use object_idbrian m. carlson2017-07-17
* | | | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-13
|\ \ \ \ | |/ / / |/| | |
| * | | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-23
* | | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-05
|\ \ \ \
| * | | | submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-23
| * | | | submodule: add repo_read_gitmodulesBrandon Williams2017-06-23
| | | | |
| | \ \ \
| *-. \ \ \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-23
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | Spelling fixesVille Skyttä2017-06-27
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | config: don't include config.h by defaultBrandon Williams2017-06-15
* | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-13
|\ \ \ \ | |_|/ / |/| | |
| * | | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-01
| * | | submodule loading: separate code path for .gitmodules and config overlayStefan Beller2017-05-30
| * | | reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller2017-05-30
* | | | Merge branch 'bw/pathspec-sans-the-index'Junio C Hamano2017-05-30
|\ \ \ \
| * | | | pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flagBrandon Williams2017-05-12
| * | | | submodule: add die_in_unpopulated_submodule functionBrandon Williams2017-05-10
| | |/ / | |/| |
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-05-29
|\ \ \ \
| * | | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-08
| * | | | Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson2017-05-08
| * | | | submodule: convert merge_submodule to use struct object_idbrian m. carlson2017-05-08
| |/ / /
* | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2017-05-29
|\ \ \ \
| * | | | diff: recurse into nested submodules for inline diffStefan Beller2017-05-08
* | | | | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-05-29
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | submodule: properly recurse for read-tree and checkoutStefan Beller2017-05-04
| * | | | submodule: avoid auto-discovery in new working tree manipulator codeStefan Beller2017-05-04
| * | | | submodule_move_head: reuse child_process structure for futher commandsStefan Beller2017-05-04
| | |/ / | |/| |
* | | | Merge branch 'sb/reset-recurse-submodules'Junio C Hamano2017-05-29
|\ \ \ \