From: Junio C Hamano Date: Thu, 25 Sep 2025 20:18:48 +0000 (-0700) Subject: Merge branch 'cc/fast-import-strip-signed-commits' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c9a275f43196fc77ee378fa185d2a33ff1fcfc3;p=thirdparty%2Fgit.git Merge branch 'cc/fast-import-strip-signed-commits' into next "git fast-import" learned that "--signed-commits=" option that corresponds to that of "git fast-export". * cc/fast-import-strip-signed-commits: fast-import: add '--signed-commits=' option gpg-interface: refactor 'enum sign_mode' parsing --- 6c9a275f43196fc77ee378fa185d2a33ff1fcfc3 diff --cc Documentation/git-fast-import.adoc index 6e095b02a1,90f242d058..85ed7a7270 --- a/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 ~~~~~~~~~~~~~~~~~~~~~