diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-02-20 14:58:43 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-01 11:59:08 +0900 |
| commit | a63c54a019138c7aaa4624f48284722664428b15 (patch) | |
| tree | f4681e0be178886f77fe4490cae6446e1c6dbf80 | |
| parent | t9300: demonstrate bug with get-mark and empty orphan commits (diff) | |
| download | tgif-a63c54a019138c7aaa4624f48284722664428b15.tar.xz | |
git-fast-import.txt: fix wording about where ls command can appear
The docs claimed `ls` commands could appear almost anywhere, but the
code told a different story. Modify the docs to match the code.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-fast-import.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 339b6e7e98..f7e2d330b1 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -1016,8 +1016,8 @@ printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`). -The `ls` command can be used anywhere in the stream that comments are -accepted, including the middle of a commit. +The `ls` command can also be used where a `filemodify` directive can +appear, allowing it to be used in the middle of a commit. Reading from the active commit:: This form can only be used in the middle of a `commit`. |