Subject: Re: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (6648586405b77f8b8573f3a23d14c93eae2552e7)
Date: Sat, 13 Mar 2010 10:06:23 -0800
On Sat, 13 Mar 2010 10:10:09 +0100
Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de> wrote:
> On Sat, 13 Mar 2010 02:04:45 -0600
> Sukneet Basuta <scm AT sourcemage.org> wrote:
>
> > GIT changes to master grimoire by Sukneet Basuta
> > <sukneet AT sourcemage.org>:
> >
> > ChangeLog | 10 ++++++++++
> > 1 files changed, 10 insertions(+)
> >
> > New commits:
> > commit 6648586405b77f8b8573f3a23d14c93eae2552e7
> > Author: Sukneet Basuta <sukneet AT sourcemage.org>
> > Commit: Sukneet Basuta <sukneet AT sourcemage.org>
> >
> > Changlog: added all the spells that I've created
> > Did not know I was supposed to add all new spells to the
> > changelog so I'm adding all the spells I've created now
> I think the correct way of doing this would have been to revert your
> commits and re-commit them including their Changlog entries, with a
> distinct commit for each change.
That would be the correct way, but for new spell additions it's not
such a biggy as they're (fairly) unlikely to need integrations between
branches. :)