diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:30:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:30:07 -0700 |
| commit | e69a6f47c4e25a20170eb989a55257d0399f795b (patch) | |
| tree | 4891b8d55a9d188ad695c7da5c35c3744d1909b6 /Documentation | |
| parent | Merge branch 'np/pack' (diff) | |
| parent | diff: vary default prefix depending on what are compared (diff) | |
| download | tgif-e69a6f47c4e25a20170eb989a55257d0399f795b.tar.xz | |
Merge branch 'jc/diff-prefix'
* jc/diff-prefix:
diff: vary default prefix depending on what are compared
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 922ac7b44d..bea867df60 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -585,6 +585,22 @@ diff.external:: you want to use an external diff program only on a subset of your files, you might want to use linkgit:gitattributes[5] instead. +diff.mnemonicprefix:: + If set, 'git-diff' uses a prefix pair that is different from the + standard "a/" and "b/" depending on what is being compared. When + this configuration is in effect, reverse diff output also swaps + the order of the prefixes: +'git-diff';; + compares the (i)ndex and the (w)ork tree; +'git-diff HEAD';; + compares a (c)ommit and the (w)ork tree; +'git diff --cached';; + compares a (c)ommit and the (i)ndex; +'git-diff HEAD:file1 file2';; + compares an (o)bject and a (w)ork tree entity; +'git diff --no-index a b';; + compares two non-git things (1) and (2). + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the 'git-diff' option '-l'. |