[GNC-dev] gnucash master: Multiple changes pushed

[Christopher Lam]

Hi the branch name was originally 'maint-'. Github doesn't allow changing
branch names without creating a new PR. So, next time I'll just need to
amend the merge commit message (and also add a #link to PR).

On Wed, 13 May 2020 at 12:21, Geert Janssens <geert.gnucash at kobaltwit.be>
wrote:

> Op woensdag 13 mei 2020 14:17:20 CEST schreef Geert Janssens:
> > Op dinsdag 12 mei 2020 16:06:05 CEST schreef Christopher Lam:
> > > Updated      via  https://github.com/Gnucash/gnucash/commit/57fe0515
> (commit)
> > >
> > >      via  https://github.com/Gnucash/gnucash/commit/b4d7386d (commit)
> > >
> > >     from  https://github.com/Gnucash/gnucash/commit/ebd9db89 (commit)
> > >
> > > commit 57fe05156535bc67960b2497393cf8eee3525a73
> > > Merge: ebd9db892 b4d7386d4
> > > Author: Christopher Lam <christopher.lck at gmail.com>
> > > Date:   Tue May 12 21:47:36 2020 +0800
> > >
> > >     Merge branch 'maint-trep-case-insensitive' PR #719
> > >
> > > commit b4d7386d44122384c036ae68c1a090bc36210389
> > > Author: Christopher Lam <christopher.lck at gmail.com>
> > > Date:   Mon May 11 20:51:21 2020 +0800
> > >
> > >     [trep-engine] "Transaction Filter is case insensitive"
> > >
> > >     add Filter option to make Transaction Filter case insensitive.
> > >
> > > Summary of changes:
> > >  .../reports/standard/test/test-transaction.scm     | 16 ++++++++++++
> > >  gnucash/report/trep-engine.scm                     | 29
> > >
> > > ++++++++++++++++++---- 2 files changed, 40 insertions(+), 5
> deletions(-)
> > >
> > > _______________________________________________
> > > gnucash-patches mailing list
> > > gnucash-patches at gnucash.org
> > > https://lists.gnucash.org/mailman/listinfo/gnucash-patches
> >
> > This commit merges some of your local maint changes into public master.
> > However that commit in question hasn't been pushed to maint yet as far
> as I
> > can see. Is that intentional ?
> >
> > Geert
>
> Ok, on the PR I see John asked to merge it into master only. To avoid
> confusion, please change the feature branch name before doing so. The fact
> it
> mentions "maint-" set me on the wrong track. Or at the very least motivate
> the
> branch change in the merge commit.
>
> Regards,
>
> Geert
>
>
>