development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-fast-import-doc-dedup-done' into maint

Browse source 
* jk/maint-fast-import-doc-dedup-done:
  git-fast-import(1): remove duplicate '--done' option
This commit is contained in:
Junio C Hamano 2013-01-14 07:48:39 -08:00
parent f2f5449379 850bc56def
commit 7b9ea42b3c
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Documentation/git-fast-import.txt
View file

@ -39,10 +39,6 @@ OPTIONS
See ``Date Formats'' below for details about which formats
are supported, and their syntax.
-- done::
Terminate with error if there is no 'done' command at the
end of the stream.
--force::
Force updating modified existing branches, even if doing
so would cause commits to be lost (as the new commit does
@ -108,7 +104,8 @@ OPTIONS
output.
--done::
Require a `done` command at the end of the stream.
Terminate with error if there is no `done` command at the
end of the stream.
This option might be useful for detecting errors that
cause the frontend to terminate before it has started to
write a stream.