On Mai 19 2020, Gerald Pfeifer wrote: > What now?
$ sudo zypper in git-merge-changelog $ git config --global merge.merge-changelog.name "GNU-style ChangeLog merge driver" $ git config --global merge.merge-changelog.driver "git-merge-changelog %O %A %B" $ printf "ChangeLog*\tmerge=merge-changelog\n" >> - ~/.config/git/attributes Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."
