summaryrefslogtreecommitdiffstats
path: root/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-05-06 05:10:29 +0000
committerJunio C Hamano <junio@kernel.org>2011-05-06 05:10:29 +0000
commita0dac24be13be68433d39012e1ae5e16f720f443 (patch)
tree3ecf0e59984bfc80e1e2b07064fdbd018ad20ee3 /git-fast-import.txt
parentb77f819e3fe08db387897135c3813e2cfebac86b (diff)
downloadgit-htmldocs-a0dac24be13be68433d39012e1ae5e16f720f443.tar.gz
Autogenerated HTML docs for v1.7.5.1-173-gbe0d
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r--git-fast-import.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt
index 2c2ea12c5..249249aac 100644
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -83,7 +83,7 @@ OPTIONS
skips the file if it does not exist.
--relative-marks::
- After specifying --relative-marks= the paths specified
+ After specifying --relative-marks the paths specified
with --import-marks= and --export-marks= are relative
to an internal directory in the current repository.
In git-fast-import this means that the paths are relative
@@ -93,7 +93,7 @@ OPTIONS
--no-relative-marks::
Negates a previous --relative-marks. Allows for combining
relative and non-relative marks by interweaving
- --(no-)-relative-marks= with the --(import|export)-marks=
+ --(no-)-relative-marks with the --(import|export)-marks=
options.
--cat-blob-fd=<fd>::