diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-20 22:11:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-20 22:11:02 -0700 |
| commit | 106040fe8ecb670261f423c285d494d6d0170558 (patch) | |
| tree | 6f0ea7f876baf20cfb74488de36979a16c08cc1f /git-merge-resolve.sh | |
| parent | eec8a512bc957efac656921a5aeeaef23bd9f729 (diff) | |
| parent | b200021e150320459d4f1edf1099131e0f5ae297 (diff) | |
| download | git-106040fe8ecb670261f423c285d494d6d0170558.tar.gz git-106040fe8ecb670261f423c285d494d6d0170558.tar.xz | |
Merge branch 'so/submodule-no-update-first-time' into maint
* 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 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions