diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-09 15:53:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 15:53:32 -0800 |
| commit | 3814888a634850a13afbf74146dbad6ded20bb91 (patch) | |
| tree | 6a1585488da21780c0650b74fd3f549a05ad370e /builtin/merge.c | |
| parent | 31f4da593b6d41e7c5f496542ffeca776c3fc223 (diff) | |
| parent | b200021e150320459d4f1edf1099131e0f5ae297 (diff) | |
Merge branch 'so/submodule-no-update-first-time'
* so/submodule-no-update-first-time:
t7406: "git submodule update {--merge|--rebase]" with new submodules
submodule: no [--merge|--rebase] when newly cloned
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions