Documentation: move description of -s, --no-patch to diff-options.txt
Technically, "-s, --no-patch" is implemented in diff.c ("git diff --no-patch" is essentially useless, but valid). From the user point of view, this allows the documentation to show up in "git show --help", which is one of the most useful use of the option. While we're there, add a sentence explaining why the option can be useful. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Jul 16, 2013 at 10:05 UTC
7b02c834638f6bea4cf14e4981702103b478ff4d
2 files changed
+5
-4
Documentation/diff-options.txt
+5
@@ -26,6 +26,11 @@ ifndef::git-format-patch[]
26
{git-diff? This is the default.}
27
endif::git-format-patch[]
28
29
+-s::
30
+--no-patch::
31
+ Suppress diff output. Useful for commands like `git show` that
32
+ show the patch by default, or to cancel the effect of `--patch`.
33
+
34
-U<n>::
35
--unified=<n>::
36
Generate diffs with <n> lines of context instead of
Documentation/rev-list-options.txt
-4
@@ -837,8 +837,4 @@ options may be given. See linkgit:git-diff-files[1] for more options.
837
-t::
838
839
Show the tree objects in the diff output. This implies '-r'.
840
-
841
--s::
842
---no-patch::
843
- Suppress diff output.
840
endif::git-rev-list[]