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 <john@keeping.me.uk> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Jan 9, 2013 at 19:44 UTC
c8a9f3d385bea60438b577f5db9285faf254fcc2
1 file changed
+4
-6
Documentation/git-fast-import.txt
+4
-6
@@ -82,19 +82,17 @@ OPTIONS
82
Like --import-marks but instead of erroring out, silently
83
skips the file if it does not exist.
84
85
---relative-marks::
85
+--[no-]relative-marks::
86
After specifying --relative-marks the paths specified
87
with --import-marks= and --export-marks= are relative
88
to an internal directory in the current repository.
89
In git-fast-import this means that the paths are relative
90
to the .git/info/fast-import directory. However, other
91
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.
95
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.
96
97
--cat-blob-fd=<fd>::
98
Specify the file descriptor that will be written to