diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-01-05 13:31:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-05 13:31:01 -0800 |
| commit | 9e98354ab9717480e2e15b5ae56c10c3d5702a9b (patch) | |
| tree | 716ed1df67e67bd8dccaca8909af135452806614 /Documentation | |
| parent | Merge branch 'mg/cvsimport' (diff) | |
| parent | t0021: avoid getting filter killed with SIGPIPE (diff) | |
| download | tgif-9e98354ab9717480e2e15b5ae56c10c3d5702a9b.tar.xz | |
Merge branch 'pw/convert-pathname-substitution'
* pw/convert-pathname-substitution:
t0021: avoid getting filter killed with SIGPIPE
convert filter: supply path to external driver
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 5a7f936429..22b85825ab 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -335,6 +335,16 @@ input that is already correctly indented. In this case, the lack of a smudge filter means that the clean filter _must_ accept its own output without modifying it. +Sequence "%f" on the filter command line is replaced with the name of +the file the filter is working on. A filter might use this in keyword +substitution. For example: + +------------------------ +[filter "p4"] + clean = git-p4-filter --clean %f + smudge = git-p4-filter --smudge %f +------------------------ + Interaction between checkin/checkout attributes ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |