diff options
author | Felipe Contreras <felipe.contreras@gmail.com> | 2009-10-24 12:31:32 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-10-25 09:50:28 +0300 |
commit | a75d7b54097ef0d0945cbe673a9940d6c561f95c (patch) | |
tree | 40d03cbf093fd503448d31d3a71319be3f1d4fac /builtin-fetch--tool.c | |
parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) |
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--tool.c')
-rw-r--r-- | builtin-fetch--tool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c index 3dbdf7a288..cd10dbcbc9 100644 --- a/builtin-fetch--tool.c +++ b/builtin-fetch--tool.c @@ -97,21 +97,21 @@ static int update_local_ref(const char *name, strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV)); if (in_merge_bases(current, &updated, 1)) { - fprintf(stderr, "* %s: fast forward to %s\n", + fprintf(stderr, "* %s: fast-forward to %s\n", name, note); fprintf(stderr, " old..new: %s..%s\n", oldh, newh); - return update_ref_env("fast forward", name, sha1_new, sha1_old); + return update_ref_env("fast-forward", name, sha1_new, sha1_old); } if (!force) { fprintf(stderr, - "* %s: not updating to non-fast forward %s\n", + "* %s: not updating to non-fast-forward %s\n", name, note); fprintf(stderr, " old...new: %s...%s\n", oldh, newh); return 1; } fprintf(stderr, - "* %s: forcing update to non-fast forward %s\n", + "* %s: forcing update to non-fast-forward %s\n", name, note); fprintf(stderr, " old...new: %s...%s\n", oldh, newh); return update_ref_env("forced-update", name, sha1_new, sha1_old); |