diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2009-10-24 11:31:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-24 23:50:28 -0700 |
| commit | a75d7b54097ef0d0945cbe673a9940d6c561f95c (patch) | |
| tree | 40d03cbf093fd503448d31d3a71319be3f1d4fac /builtin-fetch.c | |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
| download | git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.gz git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.xz | |
Use 'fast-forward' all over the place
It's a compound word.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fetch.c')
| -rw-r--r-- | builtin-fetch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index cb48c57ca..6303aa0f5 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -269,7 +269,7 @@ static int update_local_ref(struct ref *ref, strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); strcat(quickref, ".."); strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); - r = s_update_ref("fast forward", ref, 1); + r = s_update_ref("fast-forward", ref, 1); sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ', SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote, pretty_ref, r ? " (unable to update local ref)" : ""); @@ -287,7 +287,7 @@ static int update_local_ref(struct ref *ref, r ? "unable to update local ref" : "forced update"); return r; } else { - sprintf(display, "! %-*s %-*s -> %s (non fast forward)", + sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)", SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote, pretty_ref); return 1; |