diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-23 10:14:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-23 10:14:59 +0300 |
| commit | 0e545f75169e2c260dfb4445203c23cafdfc76ef (patch) | |
| tree | e9863c4dbd66a9207e24ac3b8015e4475ed6bfa9 /Documentation/git-check-attr.txt | |
| parent | cc216827936e40bc2e8886623fd44f55e0674932 (diff) | |
Documentation: describe 'union' low-level merge driver
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-check-attr.txt')
| -rw-r--r-- | Documentation/git-check-attr.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt index 856d2af2ed..47cb1bdfa3 100644 --- a/Documentation/git-check-attr.txt +++ b/Documentation/git-check-attr.txt @@ -23,6 +23,11 @@ OPTIONS be treated as an attribute. +SEE ALSO +-------- +gitlink:gitattributes[5]. + + Author ------ Written by Junio C Hamano <junkio@cox.net> |