Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Correct missing SP characters in grammar comment at top of fast-import.c
author
Elijah Newren
<newren@gmail.com>
Wed, 25 Mar 2009 21:22:13 +0000
(15:22 -0600)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Mar 2009 23:36:16 +0000
(16:36 -0700)
Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fast-import.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
d5b0c97
)
diff --git
a/fast-import.c
b/fast-import.c
index beeac0d0049d920726befab88a2ffa4eeddcb163..db44da3e096fcd7cb5cc1664b1d9881535585591 100644
(file)
--- a/
fast-import.c
+++ b/
fast-import.c
@@
-1,4
+1,5
@@
/*
/*
+(See Documentation/git-fast-import.txt for maintained documentation.)
Format of STDIN stream:
stream ::= cmd*;
Format of STDIN stream:
stream ::= cmd*;
@@
-18,8
+19,8
@@
Format of STDIN stream:
new_commit ::= 'commit' sp ref_str lf
mark?
new_commit ::= 'commit' sp ref_str lf
mark?
- ('author' sp name
'<' email '>'
when lf)?
- 'committer' sp name
'<' email '>'
when lf
+ ('author' sp name
sp '<' email '>' sp
when lf)?
+ 'committer' sp name
sp '<' email '>' sp
when lf
commit_msg
('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*
commit_msg
('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*
@@
-43,7
+44,7
@@
Format of STDIN stream:
new_tag ::= 'tag' sp tag_str lf
'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
new_tag ::= 'tag' sp tag_str lf
'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
- ('tagger' sp name
'<' email '>'
when lf)?
+ ('tagger' sp name
sp '<' email '>' sp
when lf)?
tag_msg;
tag_msg ::= data;
tag_msg;
tag_msg ::= data;