summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-28 13:42:30 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-28 13:42:30 -0800
commitb893e88191c61bf44ae83588d3a01e543bcb85c9 (patch)
tree1a0f25740cf25cdc4634e21aff2c35c93bf80a03 /t
parent682098b847a98f9a93b56d50b27bd5aa2141426c (diff)
parentc190ced600223f0774f6ba33f608b1e1347e623e (diff)
downloadgit-b893e88191c61bf44ae83588d3a01e543bcb85c9.tar.gz
Merge branch 'mm/status-push-pull-advise'
* mm/status-push-pull-advise: status: add advice on how to push/pull to tracking branch
Diffstat (limited to 't')
-rwxr-xr-xt/t2020-checkout-detach.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index 81005373d7..5d68729d7a 100755
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -151,6 +151,7 @@ test_expect_success 'checkout does not warn leaving reachable commit' '
cat >expect <<'EOF'
Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+ (use "git pull" to update your local branch)
EOF
test_expect_success 'tracking count is accurate after orphan check' '
reset &&