[PATCH v2 1/2] git-fast-import(1): combine documentation of --[no-]relative-marks
- From
John Keeping <john@keeping.me.uk>
- Date
- Jan 9, 2013, 19:44 UTC
- Message-ID
- <cf4a4a10c1de73491048e8283582bdbf8c79c75e.1357760256.git.john@keeping.me.uk>
- In-Reply-To
- <cover.1357760256.git.john@keeping.me.uk>
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> --- Documentation/git-fast-import.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 3da5cc2..75ce808 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -83,19 +83,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>:: Write responses to `cat-blob` and `ls` queries to the
-- 1.8.1.468.g3d9f9b6