Commit a9e67c8c authored by Dan Jacobson's avatar Dan Jacobson Committed by Junio C Hamano

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: Dan Jacobson's avatarjidanni <>
Signed-off-by: default avatarJunio C Hamano <>
parent fb3bb3d1
......@@ -19,16 +19,12 @@ endif::git-format-patch[]
Generate patch (see section on generating patches).
{git-diff? This is the default.}
Synonym for "-p".
Shorthand for "--unified=<n>".
Generate diffs with <n> lines of context instead of
the usual three. Implies "-p".
......@@ -190,31 +186,25 @@ endif::git-format-patch[]
can name which subdirectory to make the output relative
to by giving a <path> as an argument.
Treat all files as text.
Shorthand for "--text".
Ignore changes in whitespace at EOL.
Ignore changes in amount of whitespace. This ignores whitespace
at line end, and considers all other sequences of one or
more whitespace characters to be equivalent.
Shorthand for "--ignore-space-change".
Ignore whitespace when comparing lines. This ignores
differences even if one line has whitespace where the other
line has none.
Shorthand for "--ignore-all-space".
Make the program exit with codes similar to diff(1).
That is, it exits with 1 if there were differences and
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment