diff options
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 5e726e1e77..3ad6404dbc 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -23,7 +23,9 @@ ifndef::git-format-patch[] -u:: --patch:: Generate patch (see section on generating patches). - {git-diff? This is the default.} +ifdef::git-diff[] + This is the default. +endif::git-diff[] endif::git-format-patch[] -s:: @@ -43,7 +45,9 @@ ifndef::git-format-patch[] --raw:: ifndef::git-log[] Generate the diff in raw format. - {git-diff-core? This is the default.} +ifdef::git-diff-core[] + This is the default. +endif::git-diff-core[] endif::git-log[] ifdef::git-log[] For each commit, show a summary of changes using the raw diff @@ -441,8 +445,8 @@ endif::git-format-patch[] -O<orderfile>:: Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the `diff.orderfile` configuration variable - (see linkgit:git-config[1]). To cancel `diff.orderfile`, + This overrides the `diff.orderFile` configuration variable + (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`. ifndef::git-format-patch[] |