Documentation/diff-options.txt: unify options
Instead of listing short option (e.g. "-U<n>") as a shorthand for its longer counterpart (e.g. "--unified=<n>"), list the synonyms together. It saves one indirection to find what the reader wants. Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
jidanni@jidanni.org committed
Dec 29, 2008 at 15:03 UTC
a9e67c8ccc6958d09c575a3d4837a49d8a2ec7d5
1 file changed
+4
-14
Documentation/diff-options.txt
+4
-14
@@ -19,16 +19,12 @@ endif::git-format-patch[]
19
20
ifndef::git-format-patch[]
21
-p::
22
+-u::
23
Generate patch (see section on generating patches).
24
{git-diff? This is the default.}
25
endif::git-format-patch[]
26
26
--u::
27
- Synonym for "-p".
28
-
27
-U<n>::
30
- Shorthand for "--unified=<n>".
31
-
28
--unified=<n>::
29
Generate diffs with <n> lines of context instead of
30
the usual three. Implies "-p".
@@ -190,31 +186,25 @@ endif::git-format-patch[]
186
can name which subdirectory to make the output relative
187
to by giving a <path> as an argument.
188
189
+-a::
190
--text::
191
Treat all files as text.
192
196
--a::
197
- Shorthand for "--text".
198
-
193
--ignore-space-at-eol::
194
Ignore changes in whitespace at EOL.
195
196
+-b::
197
--ignore-space-change::
198
Ignore changes in amount of whitespace. This ignores whitespace
199
at line end, and considers all other sequences of one or
200
more whitespace characters to be equivalent.
201
207
--b::
208
- Shorthand for "--ignore-space-change".
209
-
202
+-w::
203
--ignore-all-space::
204
Ignore whitespace when comparing lines. This ignores
205
differences even if one line has whitespace where the other
206
line has none.
207
215
--w::
216
- Shorthand for "--ignore-all-space".
217
-
208
--exit-code::
209
Make the program exit with codes similar to diff(1).
210
That is, it exits with 1 if there were differences and