diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-17 12:21:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-17 12:21:20 -0800 |
| commit | 1aeb10a14d5ecf5a10a4536b873c9feb244a7848 (patch) | |
| tree | 5e5953867a1f038da8bd525c55b1f2d888e0841f /git-mergetool.sh | |
| parent | Merge branch 'nd/shallow-clone' (diff) | |
| parent | git-submodule.sh: 'checkout' is a valid update mode (diff) | |
| download | tgif-1aeb10a14d5ecf5a10a4536b873c9feb244a7848.tar.xz | |
Merge branch 'fp/submodule-checkout-mode'
"submodule.*.update=checkout", when propagated from .gitmodules to
.git/config, turned into a "submodule.*.update=none", which did not
make much sense.
* fp/submodule-checkout-mode:
git-submodule.sh: 'checkout' is a valid update mode
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions