projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f2e448 877449c)
Merge branch 'fg/submodule-keep-updating'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2011 21:31:35 +0000 (14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2011 21:31:35 +0000 (14:31 -0700)
commitff968f03e6951e8ee84cfb923f8905296286134a
treefc0bdcd4cc3562610de64b6c43661cd38e9fb09ctree | snapshot
parent5f2e448370e7c436b9ad7e7c495f4c96630f3e3ccommit | diff
parent877449c136539cf8b9b4ed9cfe33a796b7b93f93commit | 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
git-submodule.sh diff1 | diff2 | blob | history
t/t7406-submodule-update.sh diff1 | diff2 | blob | history
Git—the stupid content tracker