diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-10 09:39:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-10 09:39:08 -0700 |
| commit | 9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83 (patch) | |
| tree | b9b4fc57306b099098838c4889e49540f03bf9ae /Documentation | |
| parent | t/t4018: avoid two unnecessary sub-shell invocations (diff) | |
| parent | config.txt: fix placement of diff.noprefix (diff) | |
| download | tgif-9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83.tar.xz | |
Merge branch 'maint'
* maint:
config.txt: fix placement of diff.noprefix
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index d294dd6dcd..d82c0da2cf 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -813,8 +813,6 @@ diff.mnemonicprefix:: 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: -diff.noprefix:: - If set, 'git diff' does not show any source or destination prefix. `git diff`;; compares the (i)ndex and the (w)ork tree; `git diff HEAD`;; @@ -826,6 +824,9 @@ diff.noprefix:: `git diff --no-index a b`;; compares two non-git things (1) and (2). +diff.noprefix:: + If set, 'git diff' does not show any source or destination prefix. + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the 'git diff' option '-l'. |