[poppler] 3 commits - qt4/src qt4/tests

[Jeff Muizelaar]

On Mon, Nov 05, 2007 at 04:19:57PM +1100, Brad Hards wrote:
> On Monday 05 November 2007 16:10, Brad Hards wrote:
> >  qt4/src/poppler-form.h         |    8 ++++----
> >  qt4/tests/test-poppler-qt4.cpp |    6 ++++++
> >  2 files changed, 10 insertions(+), 4 deletions(-)
> >
> > New commits:
> > commit 570fe464a2aae4f22d0b47cce73b8bc36b116e9f
> > Merge: 1c7b7a0... 7875067...
> > Author: Brad Hards <bradh at kde.org>
> > Date:   Mon Nov 5 15:55:39 2007 +1100
> >
> >     Merge branch 'minor-fixes'
> OK, so if I'm working with a couple of branches, I should merge one, then 
> push, then merge the other, then push again?

It shouldn't make a difference when you push...

> 
> Other than that, does my git-fu look acceptable?

You can often avoid merge commits by using git-rebase. It can keep the
history cleaner.

-Jeff