Skip to content

Commit

Permalink
git-send-email.txt: move --format-patch paragraph to a proper location
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adeodato Simó authored and Junio C Hamano committed Dec 27, 2008
1 parent 3a882d9 commit f83b9ba
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Documentation/git-send-email.txt
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,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
Expand All @@ -212,6 +206,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
-------------
Expand Down

0 comments on commit f83b9ba

Please sign in to comment.