diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
commit | 4d8c3258880548510b1d23f0db517adb7dfd2486 (patch) | |
tree | eeb42aefe5555624063221d7ddc28a29f598ce7f /transport.c | |
parent | 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e (diff) | |
parent | a75d7b54097ef0d0945cbe673a9940d6c561f95c (diff) | |
download | git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.gz git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.xz |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 298dc46ec..d249203ea 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, |