* [PATCH] git-send-email.txt: move --format-patch paragraph to a proper location
@ 2008-12-27 8:50 Adeodato Simó
2008-12-27 21:54 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Adeodato Simó @ 2008-12-27 8:50 UTC (permalink / raw)
To: git, gitster; +Cc: Adeodato Simó
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>
---
Documentation/git-send-email.txt | 12 ++++++------
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
-------------
--
1.6.1.307.g07803
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-send-email.txt: move --format-patch paragraph to a proper location
2008-12-27 8:50 [PATCH] git-send-email.txt: move --format-patch paragraph to a proper location Adeodato Simó
@ 2008-12-27 21:54 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2008-12-27 21:54 UTC (permalink / raw)
To: Adeodato Simó; +Cc: git
Adeodato Simó <dato@net.com.org.es> writes:
> When introducing --format-patch, its documentation was accidentally inserted
> in the middle of documentation for --validate.
Good eyes. Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-12-27 21:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-27 8:50 [PATCH] git-send-email.txt: move --format-patch paragraph to a proper location Adeodato Simó
2008-12-27 21:54 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).