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

diff --cc Documentation/git-fast-import.txt
index 4415e636352ea88f34a798b6c29dc5e34d60d868,becee8b4e71859674495cff398a4de976f3f6a3b..02bb49886cc5f8415cec8786282681b4114a6380
--- 1/Documentation/git-fast-import.txt
--- 2/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

diff --cc fast-import.c
Simple merge

diff --cc t/t9301-fast-import-notes.sh
Simple merge