aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-fast-import.txt
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-10-08 06:45:03 +0000
committerJunio C Hamano <gitster@pobox.com>2023-10-09 12:04:21 -0700
commitcf6cac20059123d6ec3f867bb3692df62db52cf9 (patch)
tree99e0ee363183782b239257d69d28282c44100136 /Documentation/git-fast-import.txt
parent3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff)
downloadgit-cf6cac20059123d6ec3f867bb3692df62db52cf9.tar.gz
documentation: wording improvements
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fast-import.txt')
-rw-r--r--Documentation/git-fast-import.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 8b5dd6add0..a6a054f86d 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -622,7 +622,7 @@ in octal. Git only supports the following modes:
* `100755` or `755`: A normal, but executable, file.
* `120000`: A symlink, the content of the file will be the link target.
* `160000`: A gitlink, SHA-1 of the object refers to a commit in
- another repository. Git links can only be specified by SHA or through
+ another repository. Git links can only be specified either by SHA or through
a commit mark. They are used to implement submodules.
* `040000`: A subdirectory. Subdirectories can only be specified by
SHA or through a tree mark set with `--import-marks`.