git_attributes

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Next revision		 Previous revision
git_attributes [2018/06/26 11:57] – created rpjdaygit_attributes [2019/03/15 07:45] (current) – [Overview] rpjday
Line 2: Line 2:
  
 Basics of attributes, ''.gitattributes'' file. Basics of attributes, ''.gitattributes'' file.
 +
 +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://www.juandebravo.com/2017/12/02/git-filter-smudge-and-clean/|Smudge and clean filters]]
  
 ===== Samples ===== ===== Samples =====
Line 10: Line 15:
 *.c   diff=cpp *.c   diff=cpp
 *.h   diff=cpp *.h   diff=cpp
 +</code>
 +
 +==== Xcode projects ====
 +
 +<code>
 +*.pbxproj binary
 +</code>
 +
 +==== Comparing Word files ====
 +
 +<code>
 +*.docx diff=word
 </code> </code>
  • git_attributes.1530014220.txt.gz
  • Last modified: 2018/06/26 11:57
  • by rpjday