X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=8dc5b001c42376be1b9f814d516ea43f5c711071;hb=deda26b9935bdca8d140006b224a278ec0377a33;hp=1a78635fbae314e5b6bc02571b573c4bfdba5e29;hpb=144126abf99f2eac48e63b7ea85a8f3f99f814db;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 1a78635fb..8dc5b001c 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -170,6 +170,14 @@ endif::git-format-patch[] Swap two inputs; that is, show differences from index or on-disk file to tree contents. +--relative[=]:: + When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a as an argument. + --text:: Treat all files as text. @@ -205,8 +213,8 @@ endif::git-format-patch[] --ext-diff:: Allow an external diff helper to be executed. If you set an - external diff driver with gitlink:gitattributes[5], you need - to use this option with gitlink:git-log[1] and friends. + external diff driver with linkgit:gitattributes[5], you need + to use this option with linkgit:git-log[1] and friends. --no-ext-diff:: Disallow external diff drivers.