blob: 0c131b0a183776680ab178e4353949adc0a58709 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
[
{ type: install
message: <<EOM
Usage of git-merge-changelog:
- Add to .git/config of the checkout (or to your $HOME/.gitconfig) the
lines:
[merge "merge-changelog"]
name = GNU-style ChangeLog merge driver
driver = git-merge-changelog %O %A %B
- In every directory that contains a ChangeLog file, add a file
'.gitattributes' with this line:
ChangeLog merge=merge-changelog
EOM
}
]
|