diff options
| author |  Jonathan Nieder <jrnieder@uchicago.edu> | 2008-07-03 00:37:18 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-05 11:24:39 -0700 |
| commit | 0979c106498f21838140313b485f90faf06f454f (patch) | |
| tree | a5fdc36e5afcaf1557fd3389ca32bd08d8a2fe36 /Documentation/git-apply.txt | |
| parent | manpages: italicize command names in synopses (diff) | |
| download | tgif-0979c106498f21838140313b485f90faf06f454f.tar.xz | |
manpages: italicize command names
This includes nongit commands like RCS 'merge'. This patch only
italicizes names of commands if they had no formatting before.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 70d19f63eb..b7e51b885c 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -18,7 +18,7 @@ SYNOPSIS DESCRIPTION ----------- -Reads supplied diff output and applies it on a git index file +Reads supplied 'diff' output and applies it on a git index file and a work tree. OPTIONS @@ -165,9 +165,9 @@ behavior: * `error-all` is similar to `error` but shows all errors. --inaccurate-eof:: - Under certain circumstances, some versions of diff do not correctly + Under certain circumstances, some versions of 'diff' do not correctly detect a missing new-line at the end of the file. As a result, patches - created by such diff programs do not record incomplete lines + created by such 'diff' programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug. |