diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:43 -0700 |
| commit | 104985c59eb5f318daf6732af9a2b7a9f63d0857 (patch) | |
| tree | cffe5e6bcb83ac6d2fbb687ab1d34a6344084417 | |
| parent | Merge branch 'js/nedmalloc-gcc6-warnings' (diff) | |
| parent | clarify %f documentation (diff) | |
| download | tgif-104985c59eb5f318daf6732af9a2b7a9f63d0857.tar.xz | |
Merge branch 'jh/clean-smudge-f-doc'
A minor documentation update.
* jh/clean-smudge-f-doc:
clarify %f documentation
| -rw-r--r-- | Documentation/gitattributes.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index b40068bdfd..34db3e219b 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -377,6 +377,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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |