Merge branch 'cc/fast-import-strip-signed-commits'

"git fast-import" learned that "--signed-commits=<how>" option that
corresponds to that of "git fast-export".

* cc/fast-import-strip-signed-commits:
  fast-import: add '--signed-commits=<mode>' option
  gpg-interface: refactor 'enum sign_mode' parsing

diff --cc Documentation/git-fast-import.adoc
index 6e095b02a1fcecdaa889645f2b4103c7874562f0,90f242d0583d1098135c59c39b0d89bbe4b68f1a..85ed7a727038bbe501f3780dced200a51fe9ea28
--- 1/Documentation/git-fast-import.adoc
--- 2/Documentation/git-fast-import.adoc
+++ b/Documentation/git-fast-import.adoc
@@@ -61,11 -61,16 +61,16 @@@ OPTION
        currently impacts only the `export-marks`, `import-marks`, and
        `import-marks-if-exists` feature commands.
  +
 -      Only enable this option if you trust the program generating the
 -      fast-import stream! This option is enabled automatically for
 -      remote-helpers that use the `import` capability, as they are
 -      already trusted to run their own code.
 +Only enable this option if you trust the program generating the
 +fast-import stream! This option is enabled automatically for
 +remote-helpers that use the `import` capability, as they are
 +already trusted to run their own code.
  
+ --signed-commits=(verbatim|warn-verbatim|warn-strip|strip|abort)::
+       Specify how to handle signed commits.  Behaves in the same way
+       as the same option in linkgit:git-fast-export[1], except that
+       default is 'verbatim' (instead of 'abort').
+ 
  Options for Frontends
  ~~~~~~~~~~~~~~~~~~~~~
  

diff --cc t/meson.build
Simple merge