From a0dac24be13be68433d39012e1ae5e16f720f443 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 6 May 2011 05:10:29 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.7.5.1-173-gbe0d --- git-fast-import.html | 6 +++--- git-fast-import.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/git-fast-import.html b/git-fast-import.html index 0697ca14b2..cdf5fa9e61 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -536,7 +536,7 @@ the frontend program in use.

- 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 @@ -551,7 +551,7 @@ the frontend program in use.

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.

@@ -1904,7 +1904,7 @@ compression.

diff --git a/git-fast-import.txt b/git-fast-import.txt index 2c2ea12c5c..249249aac7 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=:: -- 2.11.4.GIT