diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
| commit | 076ffcc834f02a4f11d7f4fe8825be3b065020ff (patch) | |
| tree | 6f5fa28df80c60c9b0a1dfab028d3db33ae22fa0 /git-apply.txt | |
| parent | 3f2ed6f9b744f05cf2ad32b0c0c80aa149d9fdcb (diff) | |
| download | git-htmldocs-076ffcc834f02a4f11d7f4fe8825be3b065020ff.tar.gz | |
Autogenerated HTML docs for v1.8.1.2-545-g2f19ad
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-apply.txt b/git-apply.txt index 634b84e4b..f60532794 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -24,7 +24,7 @@ Reads the supplied diff output (i.e. "a patch") and applies it to files. With the `--index` option the patch is also applied to the index, and with the `--cached` option the patch is only applied to the index. Without these options, the command applies the patch only to files, -and does not require them to be in a git repository. +and does not require them to be in a Git repository. This command applies the patch but does not create a commit. Use linkgit:git-am[1] to create commits from patches generated by @@ -198,7 +198,7 @@ behavior: * `fix` outputs warnings for a few such errors, and applies the patch after fixing them (`strip` is a synonym --- the tool used to consider only trailing whitespace characters as errors, and the - fix involved 'stripping' them, but modern gits do more). + fix involved 'stripping' them, but modern Gits do more). * `error` outputs warnings for a few such errors, and refuses to apply the patch. * `error-all` is similar to `error` but shows all errors. |