Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge branch 'sb/submodule-diff-header-fix' | Junio C Hamano | 2017-10-03 | 1 | -1/+1 | |
|\ | ||||||
| * | submodule: correct error message for missing commits | Stefan Beller | 2017-09-28 | 1 | -1/+1 | |
* | | Merge branch 'hn/submodule-comment' | Junio C Hamano | 2017-10-03 | 1 | -0/+4 | |
|\ \ | ||||||
| * | | submodule.c: describe submodule_to_gitdir() in a new comment | Han-Wen Nienhuys | 2017-09-26 | 1 | -0/+4 | |
| |/ | ||||||
* | | Merge branch 'ma/leakplugs' | Junio C Hamano | 2017-09-29 | 1 | -2/+2 | |
|\ \ | |/ |/| | ||||||
| * | object_array: use `object_array_clear()`, not `free()` | Martin Ågren | 2017-09-24 | 1 | -2/+2 | |
| * | Merge branch 'bw/push-options-recursively-to-submodules' into maint | Junio C Hamano | 2017-09-10 | 1 | -3/+15 | |
| |\ | ||||||
* | \ | Merge branch 'jn/per-repo-object-store-fixes' | Junio C Hamano | 2017-09-25 | 1 | -8/+25 | |
|\ \ \ | ||||||
| * | | | push, fetch: error out for submodule entries not pointing to commits | Stefan Beller | 2017-09-14 | 1 | -8/+25 | |
* | | | | Merge branch 'nd/prune-in-worktree' | Junio C Hamano | 2017-09-19 | 1 | -0/+9 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | revision.c: --all adds HEAD from all worktrees | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -0/+2 | |
| * | | | refs.c: move for_each_remote_ref_submodule() to submodule.c | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -0/+7 | |
* | | | | Merge branch 'bw/submodule-config-cleanup' | Junio C Hamano | 2017-08-27 | 1 | -95/+53 | |
|\ \ \ \ | ||||||
| * | | | | submodule: remove gitmodules_config | Brandon Williams | 2017-08-03 | 1 | -15/+0 | |
| * | | | | submodule-config: move submodule-config functions to submodule-config.c | Brandon Williams | 2017-08-03 | 1 | -35/+0 | |
| * | | | | submodule: remove submodule_config callback routine | Brandon Williams | 2017-08-03 | 1 | -23/+2 | |
| * | | | | unpack-trees: don't respect submodule.update | Brandon Williams | 2017-08-03 | 1 | -1/+0 | |
| * | | | | submodule: don't rely on overlayed config when setting diffopts | Brandon Williams | 2017-08-03 | 1 | -2/+10 | |
| * | | | | fetch: don't overlay config with submodule-config | Brandon Williams | 2017-08-03 | 1 | -7/+17 | |
| * | | | | submodule--helper: don't overlay config in update-clone | Brandon Williams | 2017-08-03 | 1 | -12/+26 | |
| * | | | | submodule: don't use submodule_from_name | Brandon Williams | 2017-08-02 | 1 | -2/+0 | |
| * | | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanup | Junio C Hamano | 2017-08-02 | 1 | -16/+16 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-08-27 | 1 | -47/+37 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | submodule.c: migrate diff output to use emit_diff_symbol | Stefan Beller | 2017-06-30 | 1 | -47/+37 | |
* | | | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-08-22 | 1 | -90/+67 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | submodule: merge repo_read_gitmodules and gitmodules_config | Brandon Williams | 2017-08-02 | 1 | -20/+17 | |
| * | | | | | submodule: check for unmerged .gitmodules outside of config parsing | Brandon Williams | 2017-08-02 | 1 | -24/+23 | |
| * | | | | | submodule: check for unstaged .gitmodules outside of config parsing | Brandon Williams | 2017-08-02 | 1 | -15/+17 | |
| * | | | | | submodule: remove fetch.recursesubmodules from submodule-config parsing | Brandon Williams | 2017-08-02 | 1 | -13/+6 | |
| * | | | | | submodule: remove submodule.fetchjobs from submodule-config parsing | Brandon Williams | 2017-08-02 | 1 | -15/+1 | |
| * | | | | | cache.h: add GITMODULES_FILE macro | Brandon Williams | 2017-08-02 | 1 | -10/+10 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge branch 'bw/push-options-recursively-to-submodules' | Junio C Hamano | 2017-08-22 | 1 | -3/+15 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | submodule--helper: teach push-check to handle HEAD | Brandon Williams | 2017-07-20 | 1 | -3/+15 | |
* | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-08-11 | 1 | -16/+16 | |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | ||||||
| * | | | submodule: convert submodule config lookup to use object_id | brian m. carlson | 2017-07-17 | 1 | -16/+16 | |
* | | | | Merge branch 'sb/pull-rebase-submodule' | Junio C Hamano | 2017-07-14 | 1 | -0/+26 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | pull: optionally rebase submodules (remote submodule changes only) | Stefan Beller | 2017-06-24 | 1 | -0/+26 | |
* | | | | Merge branch 'bw/repo-object' | Junio C Hamano | 2017-07-05 | 1 | -12/+23 | |
|\ \ \ \ | ||||||
| * | | | | submodule: convert is_submodule_initialized to work on a repository | Brandon Williams | 2017-06-24 | 1 | -12/+8 | |
| * | | | | submodule: add repo_read_gitmodules | Brandon Williams | 2017-06-24 | 1 | -0/+15 | |
| | | | | | ||||||
| | \ \ \ | ||||||
| *-. \ \ \ | Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob... | Junio C Hamano | 2017-06-24 | 1 | -0/+1 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
* | | | | | | Spelling fixes | Ville Skyttä | 2017-06-27 | 1 | -2/+2 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 | |
* | | | | Merge branch 'sb/submodule-blanket-recursive' | Junio C Hamano | 2017-06-13 | 1 | -9/+57 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Introduce 'submodule.recurse' option for worktree manipulators | Stefan Beller | 2017-06-01 | 1 | -2/+21 | |
| * | | | submodule loading: separate code path for .gitmodules and config overlay | Stefan Beller | 2017-05-30 | 1 | -3/+11 | |
| * | | | reset/checkout/read-tree: unify config callback for submodule recursion | Stefan Beller | 2017-05-30 | 1 | -6/+27 | |
* | | | | Merge branch 'bw/pathspec-sans-the-index' | Junio C Hamano | 2017-05-30 | 1 | -0/+63 | |
|\ \ \ \ | ||||||
| * | | | | pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flag | Brandon Williams | 2017-05-12 | 1 | -0/+33 |