[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-poppler
Subject:    Re: [poppler] Add trimbox support to pdftops
From:       Hib Eris <hib () hiberis ! nl>
Date:       2010-10-30 7:29:56
Message-ID: AANLkTi=KdAwtutT-nvx7-K5Z+ydLpOgPWjaYQRAsU9gB () mail ! gmail ! com
[Download RAW message or body]

On Sat, Oct 30, 2010 at 2:18 AM, Benjamin Adler <benadler@gmx.net> wrote:
>
>>> P.S: Sorry for making this a two-patch-mess, I need to learn git.
>>
>> That makes two of us ;-.)
>
> Then how do you send patches to poppler? For now, I'd be interested to find
> a way around learning git :|
>

You can merge your patches with:

git checkout -b merged-patches

(to create a new branch to do this experiment on)

git rebase -i master

(and chose to squash your second patch)


To avoid this with new changes you make, you can do a

git commit -a --amend

when you commit your new changes. That will add your changes to the
latest commit.


Hib
_______________________________________________
poppler mailing list
poppler@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/poppler
[prev in list] [next in list] [prev in thread] [next in thread]