summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-16 14:32:47 -0800
committerJunio C Hamano <gitster@pobox.com>2011-02-16 14:32:47 -0800
commit206af7c96b134b4962fa04fa174a25f29efd7e5e (patch)
tree3e424daab965672034b6018067654dc697ed7d23 /Documentation
parent567323d387dda559dbdba8c15453aba629393955 (diff)
parent547e8b9205349b47003ed25a82673e413e71c255 (diff)
downloadgit-206af7c96b134b4962fa04fa174a25f29efd7e5e.tar.gz
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0: fast-import: introduce "feature notes" command fast-import: clarify documentation of "feature" command
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-fast-import.txt43
1 files changed, 23 insertions, 20 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 19082b04eb..becee8b4e7 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -878,28 +878,31 @@ Require that fast-import supports the specified feature, or abort if
it does not.
....
- 'feature' SP <feature> LF
+ 'feature' SP <feature> ('=' <argument>)? LF
....
-The <feature> part of the command may be any string matching
-^[a-zA-Z][a-zA-Z-]*$ and should be understood by fast-import.
-
-Feature work identical as their option counterparts with the
-exception of the import-marks feature, see below.
-
-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
-commandline option in that only one "feature import-marks" is allowed
-per stream. Also, any --import-marks= specified on the commandline
-will override those from the stream (if any).
+The <feature> part of the command may be any one of the following:
+
+date-format::
+export-marks::
+relative-marks::
+no-relative-marks::
+force::
+ Act as though the corresponding command-line option with
+ a leading '--' was passed on the command line
+ (see OPTIONS, above).
+
+import-marks::
+ Like --import-marks except in two respects: first, only one
+ "feature import-marks" command is allowed per stream;
+ second, an --import-marks= command-line option overrides
+ any "feature import-marks" command in the stream.
+
+notes::
+ Require that the backend support the 'notemodify' (N)
+ subcommand to the 'commit' command.
+ Versions of fast-import not supporting notes will exit
+ with a message indicating so.
`option`
~~~~~~~~