Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-diff(1): "--c" -> "--cc" typo fix
author
Jonathan Nieder
<jrnieder@uchicago.edu>
Mon, 21 Jul 2008 18:34:06 +0000
(13:34 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 2 Aug 2008 06:21:23 +0000
(23:21 -0700)
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>
Documentation/diff-generate-patch.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
00332b8
)
diff --git
a/Documentation/diff-generate-patch.txt
b/Documentation/diff-generate-patch.txt
index 029c5f2b82c5bece3fa4a9e6e87b83c517e0c7f6..517e1eba3c56907ebcb1d478dceb184e53fceda4 100644
(file)
--- 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 --c
c
file
2. It is followed by one or more extended header lines
(this example shows a merge with two parents):