diff options
| author | John Keeping <john@keeping.me.uk> | 2013-01-09 19:44:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-09 22:10:53 (GMT) |
| commit | c8a9f3d385bea60438b577f5db9285faf254fcc2 (patch) | |
| tree | ff3358a85304badf972de3f8ac03b0f34463e3a6 | |
| parent | 850bc56defe2abf68ce26c5c80761d3df59c2ba7 (diff) | |
| download | git-c8a9f3d385bea60438b577f5db9285faf254fcc2.zip git-c8a9f3d385bea60438b577f5db9285faf254fcc2.tar.gz git-c8a9f3d385bea60438b577f5db9285faf254fcc2.tar.bz2 | |
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>
| -rw-r--r-- | Documentation/git-fast-import.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 47d7196..9af2506 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -82,19 +82,17 @@ OPTIONS Like --import-marks but instead of erroring out, silently skips the file if it does not exist. ---relative-marks:: +--[no-]relative-marks:: 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 to the .git/info/fast-import directory. However, other importers may use a different location. ++ +Relative and non-relative marks may be combined by interweaving +--(no-)-relative-marks with the --(import|export)-marks= 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= - options. --cat-blob-fd=<fd>:: Specify the file descriptor that will be written to |