On Wed, May 22, 2013 at 1:10 PM, David Malcolm <dmalc...@redhat.com> wrote: > I've been writing some automation around testing gcc patches, and kept > running into ChangeLog conflicts, so I wrote the following to make it > easier. > > The attached one-liner wraps "git show" into a form that omits changes > to ChangeLog files, for use when generating patches from a git repo, > so that you can run things like: > > # Get last commit, omitting ChangeLog changes: > ./contrib/git-show-non-changelog.sh > > # Get a specific commit, omitting ChangeLog changes: > ./contrib/git-show-non-changelog.sh 60623f1616b3144310f432174ebbb3e2cc6dff28 > > # Get all my non-pushed changes, omitting ChangeLog changes: > ./contrib/git-show-non-changelog.sh origin/master.. > > etc > > If there's a pre-existing way of doing this, I'm all ears, naturally [1] > > OK for trunk? (and of course, the contrib/ChangeLog entry will no doubt > conflict, irony of ironies).
Note changelog entries in emails should not be part of the patch anyways. Thanks, Andrew > > Dave > > [1] gnulib appears to have a "git-merge-changelog", but that requires > building/installing it at the receiving end
