diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-06-02 13:35:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-02 13:35:04 -0700 |
| commit | e34df9a6e591be60172e3308b429bd7d243dfce8 (patch) | |
| tree | 4dadc0cddfb66b677cc4d624bdcc569ee4e55697 /Documentation | |
| parent | Merge branch 'rs/checkout-b-track-error' (diff) | |
| parent | diff: add config option relative (diff) | |
| download | tgif-e34df9a6e591be60172e3308b429bd7d243dfce8.tar.xz | |
Merge branch 'la/diff-relative-config'
The commands in the "diff" family learned to honor "diff.relative"
configuration variable.
* la/diff-relative-config:
diff: add config option relative
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/diff.txt | 4 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index ff09f1cf73..c3ae136eba 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -105,6 +105,10 @@ diff.mnemonicPrefix:: diff.noprefix:: If set, 'git diff' does not show any source or destination prefix. +diff.relative:: + If set to 'true', 'git diff' does not show changes outside of the directory + and show pathnames relative to the current directory. + diff.orderFile:: File indicating how to order files within a diff. See the '-O' option to linkgit:git-diff[1] for details. diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index bb31f0c42b..7987d72b02 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -643,15 +643,18 @@ ifndef::git-format-patch[] -R:: Swap two inputs; that is, show differences from index or on-disk file to tree contents. +endif::git-format-patch[] --relative[=<path>]:: +--no-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 <path> as an argument. -endif::git-format-patch[] + `--no-relative` can be used to countermand both `diff.relative` config + option and previous `--relative`. -a:: --text:: |