diff options
author | Jeff King <peff@peff.net> | 2013-04-02 15:05:12 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-02 16:14:13 -0700 |
commit | caa2036b3b4105bfe34f01115e4fb34b78a4db86 (patch) | |
tree | e2a550e4a13ce962cce354347fc890be9b36eb80 /advice.c | |
parent | 1a15d00bb910de0a86981f0d75836feac71d1fe0 (diff) | |
download | git-caa2036b3b4105bfe34f01115e4fb34b78a4db86.tar.gz git-caa2036b3b4105bfe34f01115e4fb34b78a4db86.tar.xz |
branch: give advice when tracking start-point is missing
If the user requests to --set-upstream-to a branch that does
not exist, then either:
1. It was a typo.
2. They thought the branch should exist.
In case (1), there is not much we can do beyond showing the
name we tried to use. For case (2), though, we can help to
guide them through common workflows.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.c')
-rw-r--r-- | advice.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -13,6 +13,7 @@ int advice_commit_before_merge = 1; int advice_resolve_conflict = 1; int advice_implicit_identity = 1; int advice_detached_head = 1; +int advice_set_upstream_failure = 1; static struct { const char *name; @@ -31,6 +32,7 @@ static struct { { "resolveconflict", &advice_resolve_conflict }, { "implicitidentity", &advice_implicit_identity }, { "detachedhead", &advice_detached_head }, + { "setupstreamfailure", &advice_set_upstream_failure }, /* make this an alias for backward compatibility */ { "pushnonfastforward", &advice_push_update_rejected } |