[vlc-devel] [PATCH] Some Corrections

[basOS G]

2008/8/19 Jean-Baptiste Kempf <jb at videolan.org>

> On Tue, Aug 19, 2008 at 09:00:53PM +0300, basOS G wrote :
> > 2008/8/19 Christophe Mutricy <xtophe at videolan.org>
> > > 2008/8/19, noxelia at gmail.com <noxelia at gmail.com>:
> > > > From: basOS G <noxelia 4t gmail . com>
> > > >
> > > > ---
> > > >  modules/video_filter/beep.c          |    2 +-
> > > >  modules/video_filter/static_detect.c |   68
> > > +++++++++++++++++++---------------
> > > >  2 files changed, 39 insertions(+), 31 deletions(-)
> > > >
> > > Could you merge this patch with the one adding the static module ?
> > > It would make the reviewing much easier
> > i searched  a little but did not find a way to produce a single patch
> file.
> > I had 3 local commits on my local git rep, so 3 patch files were made..
> > You mean to combine the patches by hand or is there an automated way for
> > this?
> Cannot git rebase -i origin help you to merge two commits ?
>
> Best Regards,
>

It was something like git rebase -i master my_branch and then marking the 2
last commits as squash. Super patch :) sent ....
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20080819/bb773ab8/attachment.html>