> PTPi pushed a commit to branch master > in repository groff. Peter, please use
git pull -r before `git push' so that we avoid branch merging. In most cases, rebasing should work out of the box. In addition, I recommend to build and install `git-merge-changelog' to allowing easy merging of ChangeLog entries; see http://git.savannah.gnu.org/cgit/gnulib.git/tree/lib/git-merge-changelog.c for installation instructions and usage (after checking out the `gnulib' git repository). Werner
