diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-04-04 19:56:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-04 19:56:24 +0200 |
| commit | ba2452b247dfd455bccbcb04acdcfd142cb5397e (patch) | |
| tree | c026f02a9e732ccbb6b5fd94b58955e7aa7d7abd /advice.h | |
| parent | Merge branch 'rc/fetch-refetch' (diff) | |
| parent | tracking branches: add advice to ambiguous refspec error (diff) | |
| download | git-ba2452b247dfd455bccbcb04acdcfd142cb5397e.tar.xz git-ba2452b247dfd455bccbcb04acdcfd142cb5397e.zip | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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, |