aboutsummaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAge
* Merge branch 'bw/submodule-sans-cache-compat'Junio C Hamano2017-12-27
|\
| * submodule: convert get_next_submodule to not rely on the_indexBrandon Williams2017-12-12
| * submodule: used correct index in is_staging_gitmodules_okBrandon Williams2017-12-12
| * submodule: convert stage_updated_gitmodules to take a struct index_stateBrandon Williams2017-12-12
* | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-13
|\ \ | |/ |/|
| * Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-13
* | Merge branch 'sb/submodule-recursive-checkout-detach-head'Junio C Hamano2017-12-06
|\ \
| * | recursive submodules: detach HEAD from new stateStefan Beller2017-07-25
* | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-21
|\ \ \ | |_|/ |/| |
| * | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-01
* | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-09
|\ \ \
| * | | diff: make struct diff_flags members lowercaseBrandon Williams2017-11-01
| * | | diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-01
| * | | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-01
| * | | diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-01
* | | | Merge branch 'hv/fetch-moved-submodules-on-demand'Junio C Hamano2017-11-06
|\ \ \ \
| * | | | submodule: simplify decision tree whether to or not to fetchHeiko Voigt2017-10-17
| * | | | implement fetching of moved submodulesHeiko Voigt2017-10-17
| |/ / /
* | | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-16
|/ / /
* | | Merge branch 'sb/submodule-diff-header-fix'Junio C Hamano2017-10-03
|\ \ \
| * | | submodule: correct error message for missing commitsStefan Beller2017-09-28
* | | | Merge branch 'hn/submodule-comment'Junio C Hamano2017-10-03
|\ \ \ \
| * | | | submodule.c: describe submodule_to_gitdir() in a new commentHan-Wen Nienhuys2017-09-26
| |/ / /
* | | | Merge branch 'ma/leakplugs'Junio C Hamano2017-09-29
|\ \ \ \ | |/ / / |/| | |
| * | | object_array: use `object_array_clear()`, not `free()`Martin Ågren2017-09-24
| * | | Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano2017-09-10
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch 'jn/per-repo-object-store-fixes'Junio C Hamano2017-09-25
|\ \ \ \
| * | | | push, fetch: error out for submodule entries not pointing to commitsStefan Beller2017-09-14
| | |_|/ | |/| |
* | | | Merge branch 'nd/prune-in-worktree'Junio C Hamano2017-09-19
|\ \ \ \ | |/ / / |/| | |
| * | | revision.c: --all adds HEAD from all worktreesNguyễn Thái Ngọc Duy2017-08-24
| * | | refs.c: move for_each_remote_ref_submodule() to submodule.cNguyễn Thái Ngọc Duy2017-08-24
* | | | 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
| | |_|/ / | |/| | |