@matheusbsbs / matheus-bagliano / commits / f83b9ba209
Fork 0

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ó <dato@net.com.org.es> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Adeodato Simó committed Dec 27, 2008 at 09:50 UTC f83b9ba20973472f64699e1e2707b74da211a89b
1 file changed +6 -6
Documentation/git-send-email.txt
+6 -6
@@ -197,12 +197,6 @@ Administering
197 --[no-]validate::
198 Perform sanity checks on patches.
199 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.
200 +
201 --
202 * Warn of patches that contain lines longer than 998 characters; this
@@ -212,6 +206,12 @@ Administering
206 Default is the value of 'sendemail.validate'; if this is not set,
207 default to '--validate'.
208
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 +
215
216 CONFIGURATION
217 -------------