undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  config.txt: fix placement of diff.noprefix
This commit is contained in:
Junio C Hamano 2010-09-10 09:39:08 -07:00
commit 9ab5a338fc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/config.txt
View File

@ -813,8 +813,6 @@ diff.mnemonicprefix::
standard "a/" and "b/" depending on what is being compared. When standard "a/" and "b/" depending on what is being compared. When
this configuration is in effect, reverse diff output also swaps this configuration is in effect, reverse diff output also swaps
the order of the prefixes: the order of the prefixes:
diff.noprefix::
If set, 'git diff' does not show any source or destination prefix.
`git diff`;; `git diff`;;
compares the (i)ndex and the (w)ork tree; compares the (i)ndex and the (w)ork tree;
`git diff HEAD`;; `git diff HEAD`;;
@ -826,6 +824,9 @@ diff.noprefix::
`git diff --no-index a b`;; `git diff --no-index a b`;;
compares two non-git things (1) and (2). compares two non-git things (1) and (2).
diff.noprefix::
If set, 'git diff' does not show any source or destination prefix.
diff.renameLimit:: diff.renameLimit::
The number of files to consider when performing the copy/rename The number of files to consider when performing the copy/rename
detection; equivalent to the 'git diff' option '-l'. detection; equivalent to the 'git diff' option '-l'.