summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2017-08-23 19:49:35 +0200
committerJunio C Hamano <gitster@pobox.com>2017-08-23 12:17:22 -0700
commit7560f547e614244fe1d4648598d4facf7ed33a56 (patch)
tree7cd5d283d3157191ca641073ed104c1f6eec5023 /notes-merge.c
parent3c82eec8fbae30860c58afba11e8b48186a06c35 (diff)
downloadgit-7560f547e614244fe1d4648598d4facf7ed33a56.tar.gz
treewide: correct several "up-to-date" to "up to date"ma/up-to-date
Follow the Oxford style, which says to use "up-to-date" before the noun, but "up to date" after it. Don't change plumbing (specifically send-pack.c, but transport.c (git push) also has the same string). This was produced by grepping for "up-to-date" and "up to date". It turned out we only had to edit in one direction, removing the hyphens. Fix a typo in Documentation/git-diff-index.txt while we're there. Reported-by: Jeffrey Manian <jeffrey.manian@gmail.com> Reported-by: STEVEN WHITE <stevencharleswhitevoices@gmail.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
-rw-r--r--notes-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c
index 70e3fbeefb..a4cb76f0f5 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -625,7 +625,7 @@ int notes_merge(struct notes_merge_options *o,
if (!oidcmp(&remote->object.oid, base_oid)) {
/* Already merged; result == local commit */
if (o->verbosity >= 2)
- printf("Already up-to-date!\n");
+ printf("Already up to date!\n");
oidcpy(result_oid, &local->object.oid);
goto found_result;
}