Skip to content

Commit c8a9f3d

Browse files
johnkeepinggitster
authored andcommitted
git-fast-import(1): combine documentation of --[no-]relative-marks
The descriptions of '--relative-marks' and '--no-relative-marks' make more sense when read together instead of as two independent options. Combine them into a single description block. Signed-off-by: John Keeping <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 850bc56 commit c8a9f3d

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Documentation/git-fast-import.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,17 @@ OPTIONS
8282
Like --import-marks but instead of erroring out, silently
8383
skips the file if it does not exist.
8484

85-
--relative-marks::
85+
--[no-]relative-marks::
8686
After specifying --relative-marks the paths specified
8787
with --import-marks= and --export-marks= are relative
8888
to an internal directory in the current repository.
8989
In git-fast-import this means that the paths are relative
9090
to the .git/info/fast-import directory. However, other
9191
importers may use a different location.
92+
+
93+
Relative and non-relative marks may be combined by interweaving
94+
--(no-)-relative-marks with the --(import|export)-marks= options.
9295

93-
--no-relative-marks::
94-
Negates a previous --relative-marks. Allows for combining
95-
relative and non-relative marks by interweaving
96-
--(no-)-relative-marks with the --(import|export)-marks=
97-
options.
9896

9997
--cat-blob-fd=<fd>::
10098
Specify the file descriptor that will be written to

0 commit comments

Comments
 (0)