summaryrefslogtreecommitdiffstats
path: root/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-01-01 00:02:47 +0000
committerJunio C Hamano <junio@kernel.org>2010-01-01 00:02:47 +0000
commit6d325dff7434895753dcad82809783644dec75f6 (patch)
tree35763f652a10a98b55b7947ad6890ec289b3a18c /git-fast-import.txt
parentdab291e780999058b6d88586b8a3b3b84ed9a7ce (diff)
downloadgit-htmldocs-6d325dff7434895753dcad82809783644dec75f6.tar.gz
Autogenerated HTML docs for v1.6.6-75-g37bae
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r--git-fast-import.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt
index 288032c7b..e6d364f53 100644
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -311,8 +311,8 @@ change to the project.
....
'commit' SP <ref> LF
mark?
- ('author' SP <name> SP LT <email> GT SP <when> LF)?
- 'committer' SP <name> SP LT <email> GT SP <when> LF
+ ('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
+ 'committer' (SP <name>)? SP LT <email> GT SP <when> LF
data
('from' SP <committish> LF)?
('merge' SP <committish> LF)?
@@ -657,7 +657,7 @@ lightweight (non-annotated) tags see the `reset` command below.
....
'tag' SP <name> LF
'from' SP <committish> LF
- 'tagger' SP <name> SP LT <email> GT SP <when> LF
+ 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF
data
....