diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-05 14:43:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-05 14:43:45 -0700 |
| commit | be0dca39e960d67511ca5a75887b903ccae7ccce (patch) | |
| tree | 3508b7a17ec58dd8b3ad716e07437e535e9d8386 /Documentation | |
| parent | 505a138cbd5c45d890d180383c8bd808ee8105aa (diff) | |
| parent | 8fe6177ac640ca36814ad3394d4e86b4ce8e29e3 (diff) | |
| download | git-be0dca39e960d67511ca5a75887b903ccae7ccce.tar.gz git-be0dca39e960d67511ca5a75887b903ccae7ccce.tar.xz | |
Merge branch 'maint'
* maint:
t3701: fix here document
git-fast-import.txt: --relative-marks takes no parameter
shell: add missing initialization of argv0_path
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-import.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 2c2ea12c5..249249aac 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/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=<fd>:: |