3 ## Set merge driver for ChangeLog files
4 # See gnulib's lib/git-merge-changelog.c (or git-merge-changelog(1))
5 # for per-user setup instructions.
7 # The short version of this (optional) procedure is:
9 # (1) Install git-merge-changelog (this is the tricky part!)
11 # (2) Add something like the following to your ~/.gitconfig:
13 # [merge "merge-changelog"]
14 # name = GNU-style ChangeLog merge driver
15 # driver = git-merge-changelog %O %A %B
17 # (3) Enjoy mostly effortless ChangeLog merges, at least until the
18 # file gets renamed again ...
20 ChangeLog merge=merge-changelog
22 # Setup whitespace error detection.
24 # (1) Spaces before tabs,
26 # (2) Use of spaces where a tab should be used,
28 # (3) Trailing whitespace,
30 *.cxx whitespace=space-before-tab,indent-with-non-tab,trailing-space
31 *.cc whitespace=space-before-tab,indent-with-non-tab,trailing-space
32 *.cpp whitespace=space-before-tab,indent-with-non-tab,trailing-space
33 *.[cChH] whitespace=space-before-tab,indent-with-non-tab,trailing-space
34 *.exp whitespace=space-before-tab,indent-with-non-tab,trailing-space
35 *.tcl whitespace=space-before-tab,indent-with-non-tab,trailing-space