[Geany-devel] When is the scintilla component going to be updated?
Erik de Castro Lopo
mle+tools at xxxxx
Wed Aug 11 12:16:18 UTC 2010
Thomas Martitz wrote:
> On 11.08.2010 12:56, Jiří Techet wrote:
> > I'm using the git mirror that geany provides. I keep master in sync
> > with the geany mirror without any extra patches applied (so basically
> > I do 'git pull' in master now and then) and have my patches in a
> > separate branch. After pulling from geany's repository I checkout the
> > branch with my patches and do 'git rebase master' which puts my
> > patches on top of the current master. When sending the patches to the
> > mailing list, I do 'git send-email --attach --compose HEAD~X..', where
> > X is the number of patches I'm sending. I make the commit messages
> > detailed enough so they serve as the email body too. Just mentioning
> > this workflow as others might find it useful as well.
> >
>
> I hope you don't rebase, because I'm tracking your branches and it's a
> pain if upstream does rebasing :(
Thats why I'm using quilt :-).
Erik
--
----------------------------------------------------------------------
Erik de Castro Lopo
http://www.mega-nerd.com/
More information about the Devel
mailing list