summaryrefslogtreecommitdiff
path: root/Documentation/git-send-email.txt
diff options
context:
space:
mode:
authorAdeodato Simó <dato@net.com.org.es>2008-12-27 08:50:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-27 21:54:00 (GMT)
commitf83b9ba20973472f64699e1e2707b74da211a89b (patch)
tree42d100dc8699f51d3e60feceb0e15cf2b940e206 /Documentation/git-send-email.txt
parent3a882d9696ba2ba46adc107b92b4721e59bb60b4 (diff)
downloadgit-f83b9ba20973472f64699e1e2707b74da211a89b.zip
git-f83b9ba20973472f64699e1e2707b74da211a89b.tar.gz
git-f83b9ba20973472f64699e1e2707b74da211a89b.tar.bz2
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>
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 1278866..b69846e 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -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
@@ -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
-------------