blob: 24f30a6e287e11e392f4ce7696ccbee2a3adca88 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
|
************************************************************************
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
************************************************************************
|
