summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@uchicago.edu>2008-07-21 13:34:06 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-01 23:21:23 -0700
commit61d47feec61c0f7a6cb192bd40f17d45f6bc0560 (patch)
tree4c24534c23e2b620e0f50696a8a74d09edf56774
parentgit-submodule: move ill placed shift. (diff)
downloadtgif-61d47feec61c0f7a6cb192bd40f17d45f6bc0560.tar.xz
git-diff(1): "--c" -> "--cc" typo fix
git diff does not take a --c option. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/diff-generate-patch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 029c5f2b82..517e1eba3c 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -96,7 +96,7 @@ index fabadb8,cc95eb0..4866510
+
or like this (when '--cc' option is used):
- diff --c file
+ diff --cc file
2. It is followed by one or more extended header lines
(this example shows a merge with two parents):