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 /templates | |
| parent | 3c82eec8fbae30860c58afba11e8b48186a06c35 (diff) | |
| download | git-7560f547e614244fe1d4648598d4facf7ed33a56.tar.gz git-7560f547e614244fe1d4648598d4facf7ed33a56.tar.xz | |
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 'templates')
| -rwxr-xr-x | templates/hooks--pre-rebase.sample | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks--pre-rebase.sample index b7f81c198..db5feab8a 100755 --- a/templates/hooks--pre-rebase.sample +++ b/templates/hooks--pre-rebase.sample @@ -58,7 +58,7 @@ then not_in_topic=`git rev-list "^$topic" master` if test -z "$not_in_topic" then - echo >&2 "$topic is already up-to-date with master" + echo >&2 "$topic is already up to date with master" exit 1 ;# we could allow it, but there is no point. else exit 0 |