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

Merge branch 'jh/clean-smudge-f-doc' into maint

Browse Source 
A minor documentation update.

This was split out from a stalled jh/clean-smudge-annex topic
before discarding it.

* jh/clean-smudge-f-doc:
  clarify %f documentation
This commit is contained in:
Junio C Hamano
2016-08-10 11:55:34 -07:00
parent 574a31b5b7 52db4b0467
commit 019d8a409f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/gitattributes.txt
View File

@ -374,6 +374,11 @@ substitution. For example:
smudge = git-p4-filter --smudge %f smudge = git-p4-filter --smudge %f
------------------------ ------------------------
Note that "%f" is the name of the path that is being worked on. Depending
on the version that is being filtered, the corresponding file on disk may
not exist, or may have different contents. So, smudge and clean commands
should not try to access the file on disk, but only act as filters on the
content provided to them on standard input.
Interaction between checkin/checkout attributes Interaction between checkin/checkout attributes
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^