Re: Issue 2156 in lilypond: lost commits

[David Kastrup]

"Phil Holmes" <address@hidden> writes:

> "David Kastrup" <address@hidden> wrote in message
> news:address@hidden
>> address@hidden writes:
>>
>>> Comment #4 on issue 2156 by address@hidden: lost commits
>>> http://code.google.com/p/lilypond/issues/detail?id=2156
>>>
>>> Phil,
>>>
>>> I *think* you can simply (simply :) ) checkout the broken tree, then
>>> use gitk (as it is easier) to find commit, then reset the head back to
>>> there and then use
>>>
>>> git format-patch HEAD
>>>
>>> Which will make a patch from HEAD.
>>>
>>> I am guessing you could use HEAD^ or some other variant to move HEAD
>>> where you need it.
>>
>> Why so complicated?
>>
>> git cherry-pick commit-id
>>
>> will take the commit specified by commit-id and apply it to the
>> currently checked-out branch.
>
> Thanks, David.  If I cherry-pick, then check the make/make doc then
> push to staging, will git retain Julien's details as the developer?

I would be very much surprised if not, but you can (and actually should)
always check using

git log

or gitk or one of a number of other tools before pushing.

-- 
David Kastrup