summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2017-08-23 17:49:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-23 19:17:22 (GMT)
commit7560f547e614244fe1d4648598d4facf7ed33a56 (patch)
tree7cd5d283d3157191ca641073ed104c1f6eec5023 /Documentation/technical/trivial-merge.txt
parent3c82eec8fbae30860c58afba11e8b48186a06c35 (diff)
downloadgit-7560f547e614244fe1d4648598d4facf7ed33a56.zip
git-7560f547e614244fe1d4648598d4facf7ed33a56.tar.gz
git-7560f547e614244fe1d4648598d4facf7ed33a56.tar.bz2
treewide: correct several "up-to-date" to "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 'Documentation/technical/trivial-merge.txt')
-rw-r--r--Documentation/technical/trivial-merge.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/technical/trivial-merge.txt b/Documentation/technical/trivial-merge.txt
index c79d4a7..1f1c33d 100644
--- a/Documentation/technical/trivial-merge.txt
+++ b/Documentation/technical/trivial-merge.txt
@@ -32,7 +32,7 @@ or the result.
If multiple cases apply, the one used is listed first.
A result which changes the index is an error if the index is not empty
-and not up-to-date.
+and not up to date.
Entries marked '+' have stat information. Spaces marked '*' don't
affect the result.
@@ -65,7 +65,7 @@ empty, no entry is left for that stage). Otherwise, the given entry is
left in stage 0, and there are no other entries.
A result of "no merge" is an error if the index is not empty and not
-up-to-date.
+up to date.
*empty* means that the tree must not have a directory-file conflict
with the entry.