![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jul 2011 21:31:35 +0000 (14:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jul 2011 21:31:35 +0000 (14:31 -0700) | ||
| commit | ff968f03e6951e8ee84cfb923f8905296286134a | |
| tree | fc0bdcd4cc3562610de64b6c43661cd38e9fb09c | tree | snapshot |
| parent | 5f2e448370e7c436b9ad7e7c495f4c96630f3e3c | commit | diff |
| parent | 877449c136539cf8b9b4ed9cfe33a796b7b93f93 | commit | diff |
Merge branch 'fg/submodule-keep-updating'
* fg/submodule-keep-updating:
git-submodule.sh: clarify the "should we die now" logic
submodule update: continue when a checkout fails
git-sh-setup: add die_with_status
Conflicts:
git-submodule.sh
* fg/submodule-keep-updating:
git-submodule.sh: clarify the "should we die now" logic
submodule update: continue when a checkout fails
git-sh-setup: add die_with_status
Conflicts:
git-submodule.sh
| git-submodule.sh | diff1 | | diff2 | | blob | history |
| t/t7406-submodule-update.sh | diff1 | | diff2 | | blob | history |