X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-send-email.txt;h=ff4aeff4e6d1df6840b500dafb19fc97e2197d68;hb=5c7eee03da32ac8ff5e91159670558b0d7fb9b1a;hp=2b6d68c498a1afac3f25b2d9c1115057add805b4;hpb=bd7c6e7fc53691e2c459eaad73bc12006939333e;p=git.git diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 2b6d68c49..ff4aeff4e 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -198,12 +198,6 @@ Administering --[no-]validate:: Perform sanity checks on patches. Currently, validation means the following: - ---[no-]format-patch:: - When an argument may be understood either as a reference or as a file name, - choose to understand it as a format-patch argument ('--format-patch') - or as a file name ('--no-format-patch'). By default, when such a conflict - occurs, git send-email will fail. + -- * Warn of patches that contain lines longer than 998 characters; this @@ -213,6 +207,12 @@ Administering Default is the value of 'sendemail.validate'; if this is not set, default to '--validate'. +--[no-]format-patch:: + When an argument may be understood either as a reference or as a file name, + choose to understand it as a format-patch argument ('--format-patch') + or as a file name ('--no-format-patch'). By default, when such a conflict + occurs, git send-email will fail. + CONFIGURATION -------------