| commit | c9c63ee558ce3399bd2016388da9676d4f5ecf55 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Jul 2017 23:14:54 +0000 (13 16:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Jul 2017 23:14:54 +0000 (13 16:14 -0700) | ||
| tree | 6a799522833b916186424ff760e99818f3fe722c | treesnapshot (tar.gz zip) |
| parent | 91f69225443b3be8d3f11c5c71795169d7d00737 | commitdiff |
| parent | e8906a9019799c0761ab5447b67582ffd9bae558 | commitdiff |
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
"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