Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: fix a typo in git-apply.txt
author
Michał Kiedrowicz
<michal.kiedrowicz@gmail.com>
Thu, 3 Mar 2011 09:28:30 +0000
(10:28 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 4 Mar 2011 18:05:00 +0000
(10:05 -0800)
git-apply accepts the --cached option, not --cache.
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-apply.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
b31d202
)
diff --git
a/Documentation/git-apply.txt
b/Documentation/git-apply.txt
index 881652f4904c102104cfe0a0b1de07dbfc32da3f..2dcfc097d39dc3a18c774dbc1eab8ac343abf601 100644
(file)
--- a/
Documentation/git-apply.txt
+++ b/
Documentation/git-apply.txt
@@
-22,7
+22,7
@@
DESCRIPTION
-----------
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
-----------
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 `--cache` option the patch is only applied to the index.
+with the `--cache
d
` 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.
Without these options, the command applies the patch only to files,
and does not require them to be in a git repository.