Re: [PATCH] Documentation/diff-options.txt: unify options
From: <hidden>
Date: 2016-06-15 22:45:50
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] Documentation/diff-options.txt: unify options · <hidden>
- 2016-06-15 · Re: [PATCH] Documentation/diff-options.txt: unify options · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Documentation/diff-options.txt: unify options · <hidden>
- 2016-06-15 · Re: [PATCH] Documentation/diff-options.txt: unify options · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Documentation/diff-options.txt: unify options · Junio C Hamano <hidden>
(You were right about my previous patch being bad. At least git-am gives an error message when fed http://article.gmane.org/gmane.comp.version-control.git/104017/raw git-apply however does nothing and returns 0! Must be a bug.) OK, here's a better patch: Signed-off-by: jidanni <redacted> --- Documentation/diff-options.txt | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c62b45c..b432d25 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<n>:: - Shorthand for "--unified=<n>". - --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. +-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
--
1.5.6.5