diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-12-29 10:34:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-12-29 10:34:22 +0000 |
| commit | bbbb865819d5387ef9ee747115b30b5d2dc7e67b (patch) | |
| tree | c511e4696dcc9826712e7808904299c97d70d250 /diff-options.txt | |
| parent | 2fa431bf8e4db588a1905a08086bc88c5e476bb4 (diff) | |
| download | git-htmldocs-bbbb865819d5387ef9ee747115b30b5d2dc7e67b.tar.gz | |
Autogenerated HTML docs for v1.6.1-28-gc32f76
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/diff-options.txt b/diff-options.txt index c62b45cdb..b432d2518 100644 --- a/diff-options.txt +++ b/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 |