diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-12-21 10:59:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-21 10:59:05 -0800 |
| commit | 5d35d72fc3030360d9b717a4c755e9ec877d00e5 (patch) | |
| tree | 2b5884c11d983304e5a5460624fe941c2aa7d64b /builtin/merge-index.c | |
| parent | Merge git://ozlabs.org/~paulus/gitk (diff) | |
| parent | push: follow the "last one wins" convention for --recurse-submodules (diff) | |
| download | tgif-5d35d72fc3030360d9b717a4c755e9ec877d00e5.tar.xz | |
Merge branch 'mc/push-recurse-submodules-config'
Add new config to avoid typing "--recurse-submodules" on each push.
* mc/push-recurse-submodules-config:
push: follow the "last one wins" convention for --recurse-submodules
push: test that --recurse-submodules on command line overrides config
push: add recurseSubmodules config option
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions