Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
| git_attributes [2018/06/26 12:29] – [Linux kernel] rpjday | git_attributes [2019/03/15 07:45] (current) – [Overview] rpjday | ||
|---|---|---|---|
| Line 2: | Line 2: | ||
| Basics of attributes, '' | Basics of attributes, '' | ||
| + | |||
| + | Using attributes, you can do things like specify separate merge strategies for individual files or directories in your project, tell Git how to diff non-text files, or have Git filter content before you check it into or out of Git. | ||
| + | Links: | ||
| + | |||
| + | * [[https:// | ||
| ===== Samples ===== | ===== Samples ===== | ||
| Line 16: | Line 21: | ||
| < | < | ||
| *.pbxproj binary | *.pbxproj binary | ||
| + | </ | ||
| + | |||
| + | ==== Comparing Word files ==== | ||
| + | |||
| + | < | ||
| + | *.docx diff=word | ||
| </ | </ | ||