[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Cannot Merge Staging this mornining
From: |
David Kastrup |
Subject: |
Re: Cannot Merge Staging this mornining |
Date: |
Sat, 02 Mar 2013 10:38:37 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
"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