[deliverable/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
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