mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rh/diff-orderfile-doc'

Browse Source 
Documentation fix.

* rh/diff-orderfile-doc:
  diff: document the format of the -O (diff.orderFile) file
  diff: document behavior of relative diff.orderFile
This commit is contained in:
Junio C Hamano
2017-01-23 15:59:23 -08:00
parent e11c8261ba 874444b704
commit 831bd5e775
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/diff-config.txt
View File

@ -105,9 +105,10 @@ diff.noprefix::
If set, 'git diff' does not show any source or destination prefix.
diff.orderFile::
File indicating how to order files within a diff, using
one shell glob pattern per line.
Can be overridden by the '-O' option to linkgit:git-diff[1].
File indicating how to order files within a diff.
See the '-O' option to linkgit:git-diff[1] for details.
If `diff.orderFile` is a relative pathname, it is treated as
relative to the top of the working tree.
diff.renameLimit::
The number of files to consider when performing the copy/rename