summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:32 (GMT)
commit7ab2088255449e6336167295c4bc3e4a60126b41 (patch)
tree4377ed276fe20c29ed0367d66d249fcc85e9d451
parentf089ddd56a437eea6cd1ddc4a77f27e130cc23ea (diff)
parent391c7e40b516a0e9e7817083e0966805acffbdf3 (diff)
downloadgit-7ab2088255449e6336167295c4bc3e4a60126b41.zip
git-7ab2088255449e6336167295c4bc3e4a60126b41.tar.gz
git-7ab2088255449e6336167295c4bc3e4a60126b41.tar.bz2
Merge branch 'rt/fetch-message-fix'
A small message update. * rt/fetch-message-fix: fetch.c: fix typo in a warning message
-rw-r--r--builtin/fetch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 863c858..e8c0276 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1411,7 +1411,7 @@ static int do_fetch(struct transport *transport,
for (rm = ref_map; rm; rm = rm->next) {
if (!rm->peer_ref) {
if (source_ref) {
- warning(_("multiple branch detected, incompatible with --set-upstream"));
+ warning(_("multiple branches detected, incompatible with --set-upstream"));
goto skip;
} else {
source_ref = rm;