diff options
| author | Sverre Rabbelier <srabbelier@gmail.com> | 2009-12-04 18:07:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-05 12:43:24 -0800 |
| commit | bc3c79aefc9cdb1127e1dfd22ad19cf6c6e94f09 (patch) | |
| tree | 80ceef0c29aca1b324d3886ee7aefd0d3f4d58d6 /Documentation/git-fast-import.txt | |
| parent | 081751c882f8398081b94335faa23912a655fb1c (diff) | |
| download | git-bc3c79aefc9cdb1127e1dfd22ad19cf6c6e94f09.tar.gz git-bc3c79aefc9cdb1127e1dfd22ad19cf6c6e94f09.tar.xz | |
fast-import: add (non-)relative-marks feature
After specifying 'feature relative-marks' the paths specified with
'feature import-marks' and 'feature 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.
Add 'feature non-relative-marks' to disable this behavior, this way
it is possible to, for example, specify the import-marks location as
relative, and the export-marks location as non-relative.
Also add tests to verify this behavior.
Cc: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 752f85c9a..1a63835d2 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -75,6 +75,20 @@ OPTIONS set of marks. If a mark is defined to different values, the last file wins. +--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. + +--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. + --export-pack-edges=<file>:: After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last @@ -875,6 +889,8 @@ The following features are currently supported: * date-format * import-marks * export-marks +* relative-marks +* no-relative-marks * force The import-marks behaves differently from when it is specified as |