summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-16 00:41:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-16 00:41:02 (GMT)
commit4d8c3258880548510b1d23f0db517adb7dfd2486 (patch)
treeeeb42aefe5555624063221d7ddc28a29f598ce7f /transport.c
parent9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e (diff)
parenta75d7b54097ef0d0945cbe673a9940d6c561f95c (diff)
downloadgit-4d8c3258880548510b1d23f0db517adb7dfd2486.zip
git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.gz
git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.bz2
Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward: Use 'fast-forward' all over the place Conflicts: builtin-merge.c
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c
index 298dc46..d249203 100644
--- a/transport.c
+++ b/transport.c
@@ -668,7 +668,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count, i
break;
case REF_STATUS_REJECT_NONFASTFORWARD:
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
- "non-fast forward", porcelain);
+ "non-fast-forward", porcelain);
break;
case REF_STATUS_REMOTE_REJECT:
print_ref_status('!', "[remote rejected]", ref,