kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
jidanni@jidanni.org 2008-12-29 15:03:17 +08:00 committed by Junio C Hamano
parent fb3bb3d132
commit a9e67c8ccc
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Documentation/diff-options.txt
View File

@ -19,16 +19,12 @@ endif::git-format-patch[]


ifndef::git-format-patch[] ifndef::git-format-patch[]
-p:: -p::
-u::
Generate patch (see section on generating patches). Generate patch (see section on generating patches).
{git-diff? This is the default.} {git-diff? This is the default.}
endif::git-format-patch[] endif::git-format-patch[]


-u::
Synonym for "-p".

-U<n>:: -U<n>::
Shorthand for "--unified=<n>".

--unified=<n>:: --unified=<n>::
Generate diffs with <n> lines of context instead of Generate diffs with <n> lines of context instead of
the usual three. Implies "-p". the usual three. Implies "-p".
@ -190,31 +186,25 @@ endif::git-format-patch[]
can name which subdirectory to make the output relative can name which subdirectory to make the output relative
to by giving a <path> as an argument. to by giving a <path> as an argument.


-a::
--text:: --text::
Treat all files as text. Treat all files as text.


-a::
Shorthand for "--text".

--ignore-space-at-eol:: --ignore-space-at-eol::
Ignore changes in whitespace at EOL. Ignore changes in whitespace at EOL.


-b::
--ignore-space-change:: --ignore-space-change::
Ignore changes in amount of whitespace. This ignores whitespace Ignore changes in amount of whitespace. This ignores whitespace
at line end, and considers all other sequences of one or at line end, and considers all other sequences of one or
more whitespace characters to be equivalent. more whitespace characters to be equivalent.


-b:: -w::
Shorthand for "--ignore-space-change".

--ignore-all-space:: --ignore-all-space::
Ignore whitespace when comparing lines. This ignores Ignore whitespace when comparing lines. This ignores
differences even if one line has whitespace where the other differences even if one line has whitespace where the other
line has none. line has none.


-w::
Shorthand for "--ignore-all-space".

--exit-code:: --exit-code::
Make the program exit with codes similar to diff(1). Make the program exit with codes similar to diff(1).
That is, it exits with 1 if there were differences and That is, it exits with 1 if there were differences and