projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4651925 877449c)
Merge branch 'fg/submodule-keep-updating' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jul 2011 18:52:46 +0000 (11:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jul 2011 18:52:46 +0000 (11:52 -0700)
commit227827c0f8f880335b47bd02bc7d68619a80e862
tree7c9830c14dd9fbfc04885804f1bf26e899216324tree | snapshot
parent46519256e80ca68a1357853c4504150a2cc4c451commit | diff
parent877449c136539cf8b9b4ed9cfe33a796b7b93f93commit | diff
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
git-submodule.sh diff1 | diff2 | blob | history
t/t7406-submodule-update.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.