Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 17:20:53 +0000 (10:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 17:22:55 +0000 (10:22 -0700)
commit65281b70caf9dcf926c6649c8c20ef8891d6f3c3
tree832390dc1381d8af0a5ea63e164e6b106facc15c
parentf873a273d1381574fd9b2f3f613c0c7e40fe3a1c
parent5853caec96a45ffa7768585acc649dc78eb99354
Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin

* commit 'v1.7.2-rc0~6^2':
  DWIM 'git show -5' to 'git show --do-walk -5'
  Documentation/SubmittingPatches: Fix typo in GMail section
  Documentation/config: describe status.submodulesummary

This commit fixes one test in t3508 by making "cherry-pick -<num>"
walk the history.

A test update from Elijah Newren is squashed as an evil merge.
t/t3508-cherry-pick-many-commits.sh