diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2017-08-23 19:49:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 12:17:22 -0700 |
| commit | 7560f547e614244fe1d4648598d4facf7ed33a56 (patch) | |
| tree | 7cd5d283d3157191ca641073ed104c1f6eec5023 /Documentation/git-merge.txt | |
| parent | 3c82eec8fbae30860c58afba11e8b48186a06c35 (diff) | |
| download | git-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 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 04fdd8cf08..53366a1700 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -133,7 +133,7 @@ exception is when the changed index entries are in the state that would result from the merge already.) If all named commits are already ancestors of `HEAD`, 'git merge' -will exit early with the message "Already up-to-date." +will exit early with the message "Already up to date." FAST-FORWARD MERGE ------------------ |