summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-04-04 17:56:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-04-04 17:56:24 (GMT)
commitba2452b247dfd455bccbcb04acdcfd142cb5397e (patch)
treec026f02a9e732ccbb6b5fd94b58955e7aa7d7abd /advice.h
parent0f5e8851737282c9dd342032fe9a2d8b10367c9a (diff)
parente4921d877ab3487fbc0bde8b3e59b757d274783c (diff)
downloadgit-ba2452b247dfd455bccbcb04acdcfd142cb5397e.zip
git-ba2452b247dfd455bccbcb04acdcfd142cb5397e.tar.gz
git-ba2452b247dfd455bccbcb04acdcfd142cb5397e.tar.bz2
Merge branch 'tk/ambiguous-fetch-refspec'
Give hint when branch tracking cannot be established because fetch refspecs from multiple remote repositories overlap. * tk/ambiguous-fetch-refspec: tracking branches: add advice to ambiguous refspec error
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index f95af70..7ddc6cb 100644
--- a/advice.h
+++ b/advice.h
@@ -17,6 +17,7 @@ struct string_list;
ADVICE_ADD_EMPTY_PATHSPEC,
ADVICE_ADD_IGNORED_FILE,
ADVICE_AM_WORK_DIR,
+ ADVICE_AMBIGUOUS_FETCH_REFSPEC,
ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
ADVICE_COMMIT_BEFORE_MERGE,
ADVICE_DETACHED_HEAD,