summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 06ff449)
raw | patch | inline | side by side (parent: 06ff449)
author | Michael J Gruber <git@drmicha.warpmail.net> | |
Thu, 14 Apr 2011 07:17:26 +0000 (09:17 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 14 Apr 2011 16:19:51 +0000 (09:19 -0700) |
Remove a spurious empty line which prevented asciidoc from recognizing a
list continuation mark ('+'), so that it does not get output literally any
more.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
list continuation mark ('+'), so that it does not get output literally any
more.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git.txt | patch | blob | history |
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0c32d45248c99e9e4b51f168ba03c829ad96423f..5a174bcfc5186c129cbbb182ff47c0599c10d395 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
contents of <old|new>,
<old|new>-hex:: are the 40-hexdigit SHA1 hashes,
<old|new>-mode:: are the octal representation of the file modes.
-
+
The file parameters can point at the user's working file
(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`