mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'jh/clean-smudge-f-doc'
A minor documentation update. * jh/clean-smudge-f-doc: clarify %f documentation
This commit is contained in:
commit
104985c59e
|
@ -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
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
|
Loading…
Reference in a new issue