Hi Patrice, > [merge "merge-changelog"] > name = GNU-style ChangeLog merge driver > driver = /usr/bin/git-merge-changelog %O %A %B > > There is also the expected line in .gitattributes.
I have essentially the same config. > Typically I make some changes with changes in top of ChangeLog, > someone else has pushed changes to the top of ChangeLog too. I do a > git pull --rebase Me too. > The new changes are pulled on top of the ChangeLog, but my changes have > disappeared. If you check (e.g. with "gitk"): Have the changes to ChangeLog really disappeared? Or are they present, but 50 or 100 below the top of ChangeLog? If they have really disappeared — which never happened for me — I would guess that your /tmp or $TMPDIR is full. If they are in ChangeLog but not at the top — that's what I see usually — I have to move the ChangeLog entry and do "git commit --amend ChangeLog". (It would be better if the ChangeLog entries were kept at the top. But there are several situations: merge, pull, am -3, ..., and git does not tell the merge driver which is the precise situation.) Bruno
