Skip to content

Commit f83b9ba

Browse files
datogitster
authored andcommitted
git-send-email.txt: move --format-patch paragraph to a proper location
When introducing --format-patch, its documentation was accidentally inserted in the middle of documentation for --validate. Signed-off-by: Adeodato Simó <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3a882d9 commit f83b9ba

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/git-send-email.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,6 @@ Administering
197197
--[no-]validate::
198198
Perform sanity checks on patches.
199199
Currently, validation means the following:
200-
201-
--[no-]format-patch::
202-
When an argument may be understood either as a reference or as a file name,
203-
choose to understand it as a format-patch argument ('--format-patch')
204-
or as a file name ('--no-format-patch'). By default, when such a conflict
205-
occurs, git send-email will fail.
206200
+
207201
--
208202
* Warn of patches that contain lines longer than 998 characters; this
@@ -212,6 +206,12 @@ Administering
212206
Default is the value of 'sendemail.validate'; if this is not set,
213207
default to '--validate'.
214208

209+
--[no-]format-patch::
210+
When an argument may be understood either as a reference or as a file name,
211+
choose to understand it as a format-patch argument ('--format-patch')
212+
or as a file name ('--no-format-patch'). By default, when such a conflict
213+
occurs, git send-email will fail.
214+
215215

216216
CONFIGURATION
217217
-------------

0 commit comments

Comments
 (0)