Re: Cannot Merge Staging this mornining

[David Kastrup]

"address@hidden" <address@hidden> writes:

> On 2 mars 2013, at 10:28, David Kastrup <address@hidden> wrote:
>> 
>> How can you even do that when using git and git cl for reviews and
>> Rietveld had it on display?
>
> I make a diff off of my branch and then I do
> git apply mydiff.diff
> instead of merging.  This way I don't include the entire commit
> history of my local branch into LilyPond.

Maybe you should instead to git rebase -i, create a sensible commit
history for your work instead of one humongous commit, rebase on master
and then push.  It would likely make your work more tractable.

> But it means that I need to manually add all new files.

Not even that.  It would just mean to use git apply --index.

-- 
David Kastrup