summaryrefslogtreecommitdiffstats
path: root/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-10-22 04:12:17 +0000
committerJunio C Hamano <junio@kernel.org>2010-10-22 04:12:17 +0000
commitd2179ef025405832dff42141faed13199886b61c (patch)
treeffbde742771a380129d0223749ed086fbea39271 /git-apply.txt
parent7f9fa86e7b663383dc905c5b41bedda5cedf02e6 (diff)
downloadgit-htmldocs-d2179ef025405832dff42141faed13199886b61c.tar.gz
Autogenerated HTML docs for v1.7.3.2-90-gd4c43
Diffstat (limited to 'git-apply.txt')
-rw-r--r--git-apply.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-apply.txt b/git-apply.txt
index 4a74b23d4..881652f49 100644
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -12,10 +12,10 @@ SYNOPSIS
'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
- [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
+ [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
[--ignore-space-change | --ignore-whitespace ]
- [--whitespace=<nowarn|warn|fix|error|error-all>]
- [--exclude=PATH] [--include=PATH] [--directory=<root>]
+ [--whitespace=(nowarn|warn|fix|error|error-all)]
+ [--exclude=<path>] [--include=<path>] [--directory=<root>]
[--verbose] [<patch>...]
DESCRIPTION