Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-fast-import.txt: fix wording about where ls command can appear
author
Elijah Newren
<newren@gmail.com>
Wed, 20 Feb 2019 22:58:43 +0000
(14:58 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 1 Apr 2019 02:59:08 +0000
(11:59 +0900)
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>
Documentation/git-fast-import.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
62edbec
)
diff --git
a/Documentation/git-fast-import.txt
b/Documentation/git-fast-import.txt
index 339b6e7e982fd6aa1b5953b1cfbd25e962dac6cf..f7e2d330b1636c51c865af8ff71a60c056420bd8 100644
(file)
--- 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
-a
ccepted, including
the middle of a commit.
+The `ls` command can
also be used where a `filemodify` directive can
+a
ppear, 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`.