]> granicus.if.org Git - git/commitdiff
Merge branch 'bw/push-dry-run'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:48 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:48 +0000 (15:27 -0800)
"git push --dry-run --recurse-submodule=on-demand" wasn't
"--dry-run" in the submodules.

* bw/push-dry-run:
  push: fix --dry-run to not push submodules
  push: --dry-run updates submodules when --recurse-submodules=on-demand

1  2 
submodule.c
transport.c

diff --cc submodule.c
Simple merge
diff --cc transport.c
Simple merge