From: jidanni@jidanni.org Date: Mon, 29 Dec 2008 07:03:17 +0000 (+0800) Subject: Documentation/diff-options.txt: unify options X-Git-Tag: v1.6.1.1~37 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a9e67c8ccc6958d09c575a3d4837a49d8a2ec7d5;p=git.git Documentation/diff-options.txt: unify options Instead of listing short option (e.g. "-U") as a shorthand for its longer counterpart (e.g. "--unified="), list the synonyms together. It saves one indirection to find what the reader wants. Signed-off-by: jidanni Signed-off-by: Junio C Hamano --- diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c62b45cdb..b432d2518 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -19,16 +19,12 @@ endif::git-format-patch[] ifndef::git-format-patch[] -p:: +-u:: Generate patch (see section on generating patches). {git-diff? This is the default.} endif::git-format-patch[] --u:: - Synonym for "-p". - -U:: - Shorthand for "--unified=". - --unified=:: Generate diffs with 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 as an argument. +-a:: --text:: Treat all files as text. --a:: - Shorthand for "--text". - --ignore-space-at-eol:: Ignore changes in whitespace at EOL. +-b:: --ignore-space-change:: 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. --b:: - Shorthand for "--ignore-space-change". - +-w:: --ignore-all-space:: Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none. --w:: - Shorthand for "--ignore-all-space". - --exit-code:: Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and