summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@uchicago.edu>2008-07-21 18:34:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-22 02:17:23 (GMT)
commite57c817d9f8f67d93c9fdea30939c52a2ab44fc4 (patch)
treebda54daa45f85ac3b6fb78cab0d83ce56e449f03
parentc455c87c5cd42bbbe586b31cea1143132f3a39e4 (diff)
downloadgit-e57c817d9f8f67d93c9fdea30939c52a2ab44fc4.zip
git-e57c817d9f8f67d93c9fdea30939c52a2ab44fc4.tar.gz
git-e57c817d9f8f67d93c9fdea30939c52a2ab44fc4.tar.bz2
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 029c5f2..517e1eb 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):