diff options
| author | John Keeping <john@keeping.me.uk> | 2013-01-07 11:57:09 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-08 13:20:45 -0800 |
| commit | 850bc56defe2abf68ce26c5c80761d3df59c2ba7 (patch) | |
| tree | c62e00e3853d466abfa8a6967c1b18a3bb0b7ed9 /Documentation/git-fast-import.txt | |
| parent | 3266de10747c4ad3fa972994004fcb0fca9ebe1f (diff) | |
| download | git-850bc56defe2abf68ce26c5c80761d3df59c2ba7.tar.gz | |
git-fast-import(1): remove duplicate '--done' option
The '--done' option to git-fast-import is documented twice in its manual
page. Combine the best bits of each description, keeping the location
of the instance that was added first.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 3e7e62057e..47d71964a7 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -38,10 +38,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 @@ -106,7 +102,8 @@ OPTIONS The default behaviour is to write to `stdout`. --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. |