diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-07-13 16:14:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-07-13 16:14:54 -0700 |
commit | c9c63ee558ce3399bd2016388da9676d4f5ecf55 (patch) | |
tree | 6a799522833b916186424ff760e99818f3fe722c /t/t1601-index-bogus.sh | |
parent | Merge branch 'sb/hashmap-customize-comparison' (diff) | |
parent | builtin/fetch cleanup: always set default value for submodule recursing (diff) | |
download | tgif-c9c63ee558ce3399bd2016388da9676d4f5ecf55.tar.xz |
Merge branch 'sb/pull-rebase-submodule'
"git pull --rebase --recurse-submodules" learns to rebase the
branch in the submodules to an updated base.
* sb/pull-rebase-submodule:
builtin/fetch cleanup: always set default value for submodule recursing
pull: optionally rebase submodules (remote submodule changes only)
builtin/fetch: parse recurse-submodules-default at default options parsing
builtin/fetch: factor submodule recurse parsing out to submodule config
Diffstat (limited to 't/t1601-index-bogus.sh')
0 files changed, 0 insertions, 0 deletions