From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Feb 2011 00:40:12 +0000 (-0800)
Subject: Merge branch 'maint-1.7.0' into maint
X-Git-Tag: v1.7.4.1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707;p=git.git

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
---

a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707
diff --cc Documentation/git-fast-import.txt
index 4415e6363,becee8b4e..02bb49886
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@@ -941,13 -898,12 +941,20 @@@ import-marks:
  	second, an --import-marks= command-line option overrides
  	any "feature import-marks" command in the stream.
  
 +cat-blob::
 +	Ignored.  Versions of fast-import not supporting the
 +	"cat-blob" command will exit with a message indicating so.
 +	This lets the import error out early with a clear message,
 +	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