summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-10 00:40:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-10 00:40:12 (GMT)
commita8e4a5943a63c8fd4a3a9b70ccf4608bcc973707 (patch)
tree8a4b75f257082a2361eb75d963a7bc8546bbfc07 /Documentation
parent59ab4eb36e20b0df9231e736f7d685fb43ad9364 (diff)
parent547e8b9205349b47003ed25a82673e413e71c255 (diff)
downloadgit-a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707.zip
git-a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707.tar.gz
git-a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707.tar.bz2
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0: fast-import: introduce "feature notes" command fast-import: clarify documentation of "feature" command Conflicts: Documentation/git-fast-import.txt
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-fast-import.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 4415e63..02bb498 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -948,6 +948,13 @@ cat-blob::
rather than wasting time on the early part of an import
before the unsupported command is detected.
+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`
~~~~~~~~
Processes the specified option so that git fast-import behaves in a