summaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-29 10:20:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-29 10:22:55 -0700
commit65281b70caf9dcf926c6649c8c20ef8891d6f3c3 (patch)
tree832390dc1381d8af0a5ea63e164e6b106facc15c /wt-status.h
parentrevert: accept arbitrary rev-list options (diff)
parentDWIM 'git show -5' to 'git show --do-walk -5' (diff)
downloadtgif-65281b70caf9dcf926c6649c8c20ef8891d6f3c3.tar.xz
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.
Diffstat (limited to 'wt-status.h')
0 files changed, 0 insertions, 0 deletions