[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CG manual, pushing to staging

From: Phil Holmes
Subject: Re: CG manual, pushing to staging
Date: Sat, 18 Jul 2015 17:32:15 +0100

----- Original Message ----- From: "Federico Bruni" <address@hidden>
To: "lilypond-devel" <address@hidden>
Sent: Saturday, July 18, 2015 4:57 PM
Subject: CG manual, pushing to staging

What do you think about these instructions?

I have a few comments, but I'm not sure about any of them:

1. There's no real purpose in pulling and rebasing the staging branch, assuming that this branch should be "clean" (we should work on master or on a local branch).

2. That page should explain how to generate a patch with format-patch. I think that `git format-patch origin` works most of the times, at least in my setup.


I always use "git push origin HEAD:staging" which I'd be interested to know if this is better syntax.

3. I don't like much the `git merge` approach suggested for those who work with local branches, as the git log is a bit messed up (a merge commit is added, often faraway from the commit containing the real changes). I'd rather suggest using format-patch and git am even in this case.

Phil Holmes

reply via email to

[Prev in Thread] Current Thread [Next in Thread]