| commit | 227827c0f8f880335b47bd02bc7d68619a80e862 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Jul 2011 18:52:46 +0000 (1 11:52 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Jul 2011 18:52:46 +0000 (1 11:52 -0700) | ||
| tree | 7c9830c14dd9fbfc04885804f1bf26e899216324 | treesnapshot (tar.gz zip) |
| parent | 46519256e80ca68a1357853c4504150a2cc4c451 | commitdiff |
| parent | 877449c136539cf8b9b4ed9cfe33a796b7b93f93 | commitdiff |
Merge branch 'fg/submodule-keep-updating' into next
* 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 | blobhistory |
| t/t7406-submodule-update.sh | diff1 | diff2 | blobhistory |