From: Junio C Hamano Date: Wed, 10 Aug 2016 18:55:34 +0000 (-0700) Subject: Merge branch 'jh/clean-smudge-f-doc' into maint X-Git-Tag: v2.9.3~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/019d8a409f6ff077c171589e89ac84f6575da86c?hp=574a31b5b76b82b18e85825385d8594372152a8f Merge branch 'jh/clean-smudge-f-doc' into maint 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 --- diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index e3b1de8033..145dd10967 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -374,6 +374,11 @@ substitution. For example: 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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^