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

A minor documentation update.

* jh/clean-smudge-f-doc:
  clarify %f documentation
This commit is contained in:
Junio C Hamano 2016-08-08 14:48:43 -07:00
Родитель ffdcac4bc5 52db4b0467
Коммит 104985c59e
1 изменённых файлов: 5 добавлений и 0 удалений

Просмотреть файл

@ -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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^