Skip to content
Snippets Groups Projects
Normal view Permalink
.gitattributes 285 B
Newer Older
  • Learn to ignore specific revisions
    • René Kijewski's avatar
    make: OSX: don't fail for empty .a archives
    René Kijewski committed
    1 
    *.a binary
    Oleg Hahm's avatar
    git: handle patch files as binary  
    Oleg Hahm committed
    2 
    *.patch binary
    Joakim Nohlgård's avatar
    .gitattributes: add markdown special case.  
    Joakim Nohlgård committed
    3 4 5 6 7 
    # Default conflict marker size is 7 which causes some of the headings in
# release-notes.txt to trigger git diff --check: 'leftover conflict marker'
# when the heading is exactly 7 characters long.
*.md conflict-marker-size=100
*.txt conflict-marker-size=100