diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-04-04 10:56:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-04 10:56:24 -0700 |
| commit | ba2452b247dfd455bccbcb04acdcfd142cb5397e (patch) | |
| tree | c026f02a9e732ccbb6b5fd94b58955e7aa7d7abd /advice.c | |
| parent | 0f5e8851737282c9dd342032fe9a2d8b10367c9a (diff) | |
| parent | e4921d877ab3487fbc0bde8b3e59b757d274783c (diff) | |
| download | git-ba2452b247dfd455bccbcb04acdcfd142cb5397e.tar.gz | |
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.c')
| -rw-r--r-- | advice.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -39,6 +39,7 @@ static struct { [ADVICE_ADD_EMPTY_PATHSPEC] = { "addEmptyPathspec", 1 }, [ADVICE_ADD_IGNORED_FILE] = { "addIgnoredFile", 1 }, [ADVICE_AM_WORK_DIR] = { "amWorkDir", 1 }, + [ADVICE_AMBIGUOUS_FETCH_REFSPEC] = { "ambiguousFetchRefspec", 1 }, [ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName", 1 }, [ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 }, [ADVICE_DETACHED_HEAD] = { "detachedHead", 1 }, |