aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-send-email.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-send-email.txt')
-rw-r--r--Documentation/git-send-email.txt12
1 files changed, 6 insertions, 6 deletions
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
-------------