[thirdparty/binutils-gdb.git] / .gitattributes

# -*- conf -*-

## Set merge driver for ChangeLog files 
# See gnulib's lib/git-merge-changelog.c (or git-merge-changelog(1))
# for per-user setup instructions.
#
# The short version of this (optional) procedure is:
# 
# (1) Install git-merge-changelog (this is the tricky part!)
#
# (2) Add something like the following to your ~/.gitconfig:
#
# [merge "merge-changelog"]
#         name = GNU-style ChangeLog merge driver
#         driver = git-merge-changelog %O %A %B
#
# (3) Enjoy mostly effortless ChangeLog merges, at least until the
#     file gets renamed again ...

ChangeLog       merge=merge-changelog

# Setup whitespace error detection.
#
# (1) Spaces before tabs,
#
# (2) Use of spaces where a tab should be used,
#
# (3) Trailing whitespace,

*.cxx whitespace=space-before-tab,indent-with-non-tab,trailing-space
*.cc whitespace=space-before-tab,indent-with-non-tab,trailing-space
*.cpp whitespace=space-before-tab,indent-with-non-tab,trailing-space
*.[cChH] whitespace=space-before-tab,indent-with-non-tab,trailing-space
*.exp whitespace=space-before-tab,indent-with-non-tab,trailing-space
*.tcl whitespace=space-before-tab,indent-with-non-tab,trailing-space
Commit	Line	Data
a843ea33 SB	1	# -- conf --
	2
	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.
	6	#
	7	# The short version of this (optional) procedure is:
	8	#
	9	# (1) Install git-merge-changelog (this is the tricky part!)
	10	#
	11	# (2) Add something like the following to your ~/.gitconfig:
	12	#
	13	# [merge "merge-changelog"]
	14	# name = GNU-style ChangeLog merge driver
	15	# driver = git-merge-changelog %O %A %B
	16	#
	17	# (3) Enjoy mostly effortless ChangeLog merges, at least until the
	18	# file gets renamed again ...
	19
	20	ChangeLog merge=merge-changelog
f7f904e4 AB	21
	22	# Setup whitespace error detection.
	23	#
	24	# (1) Spaces before tabs,
	25	#
	26	# (2) Use of spaces where a tab should be used,
	27	#
	28	# (3) Trailing whitespace,
	29
	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