diff options
| author | Jonathan Nieder <jrnieder@uchicago.edu> | 2008-06-30 13:56:34 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-01 17:20:16 -0700 |
| commit | 483bc4f045881b998512ae814d6cf44d0c0cb493 (patch) | |
| tree | 1812b25a8f08841bd4cfb6566636ce6fb5b8eac3 /Documentation/git-apply.txt | |
| parent | b1889c36d85514e5e70462294c561a02c2edfe2b (diff) | |
| download | git-483bc4f045881b998512ae814d6cf44d0c0cb493.tar.gz | |
Documentation formatting and cleanup
Following what appears to be the predominant style, format
names of commands and commandlines both as `teletype text`.
While we're at it, add articles ("a" and "the") in some
places, italicize the name of the command in the manual page
synopsis line, and add a comma or two where it seems appropriate.
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 138f735fd3..70d19f63eb 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -64,7 +64,7 @@ OPTIONS without using the working tree. This implies '--index'. --build-fake-ancestor <file>:: - Newer git-diff output has embedded 'index information' + Newer `git-diff` output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs is available locally, @@ -78,7 +78,7 @@ the information is read from the current index instead. Apply the patch in reverse. --reject:: - For atomicity, linkgit:git-apply[1] by default fails the whole patch and + For atomicity, `git-apply` by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the @@ -102,7 +102,7 @@ the information is read from the current index instead. ever ignored. --unidiff-zero:: - By default, linkgit:git-apply[1] expects that the patch being + By default, `git-apply` expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with --unified=0. To bypass these @@ -113,7 +113,7 @@ discouraged. --apply:: If you use any of the options marked "Turns off - 'apply'" above, linkgit:git-apply[1] reads and outputs the + 'apply'" above, `git-apply` reads and outputs the information you asked without actually applying the patch. Give this flag after those flags to also apply the patch. @@ -147,7 +147,7 @@ discouraged. considered whitespace errors. + By default, the command outputs warning messages but applies the patch. -When linkgit:git-apply[1] is used for statistics and not applying a +When `git-apply is used for statistics and not applying a patch, it defaults to `nowarn`. + You can use different `<action>` to control this @@ -191,7 +191,7 @@ apply.whitespace:: Submodules ---------- -If the patch contains any changes to submodules then linkgit:git-apply[1] +If the patch contains any changes to submodules then `git-apply` treats these changes as follows. If --index is specified (explicitly or implicitly), then the submodule |