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 /Documentation | |
| parent | 0f5e8851737282c9dd342032fe9a2d8b10367c9a (diff) | |
| parent | e4921d877ab3487fbc0bde8b3e59b757d274783c (diff) | |
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 'Documentation')
| -rw-r--r-- | Documentation/config/advice.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index 83c2a95661..a00d0100a8 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -4,6 +4,10 @@ advice.*:: can tell Git that you do not need help by setting these to 'false': + -- + ambiguousFetchRefspec:: + Advice shown when fetch refspec for multiple remotes map to + the same remote-tracking branch namespace and causes branch + tracking set-up to fail. fetchShowForcedUpdates:: Advice shown when linkgit:git-fetch[1] takes a long time to calculate forced updates after ref updates, or to warn |