Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Windows: Make OpenSSH properly detect tty detachment.
[gitweb.git]
/
Documentation
/
diff-generate-patch.txt
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):