diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-08 13:22:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-08 13:22:53 -0800 |
| commit | 572b528217adcc7329bd42a6a184067678210679 (patch) | |
| tree | 30a89c91442bd0d6a2665294058cc72fe041c548 | |
| parent | Merge branch 'jk/pathspec-literal' (diff) | |
| parent | Merge branch 'jk/maint-fast-import-doc-dedup-done' (diff) | |
| download | tgif-572b528217adcc7329bd42a6a184067678210679.tar.xz | |
Merge branch 'jk/maint-fast-import-doc-dedup-done'
The "logical order" reorganization can come after that is done and
can cook longer in 'next'.
* jk/maint-fast-import-doc-dedup-done:
git-fast-import(1): remove duplicate '--done' option
| -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 68bca1a29d..3da5cc272a 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -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. |