]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/push.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f5c7cd9) | patch
push: follow the "last one wins" convention for --recurse-submodules
authorMike Crowe <mac@mcrowe.com>
Thu, 3 Dec 2015 13:10:35 +0000 (13:10 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Dec 2015 21:04:04 +0000 (13:04 -0800)
commitd34141cd08fb1c6938eae329a7c3122b05e9eb01
tree034d33dc8213b41628a010a0ac09abc98732c496tree | snapshot
parentf5c7cd9ecf2274547197fc8fc40564957fc9b99dcommit | diff
push: follow the "last one wins" convention for --recurse-submodules

Use the "last one wins" convention for --recurse-submodules rather
than treating conflicting options as an error.

Also, fix the declaration of the file-scope recurse_submodules
global variable to put it on a separate line.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/push.c diff | blob | blame | history
t/t5531-deep-submodule-push.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.