On 2008/10/27 12:03 +0100, Francisco Vila wrote:
> Thank you Trevor, could you show me an example?
> Suppose I'd have the two branches freshly pulled, and I wanted to
> update a file after some changes in master.
>
> I could: merge master, update my file, edit the committish of that
> file to the
Francisco Vila Monday, October 27, 2008 11:03 AM
2008/10/27 Trevor Daniels <[EMAIL PROTECTED]>:
Sometimes there is another commit in between and therefore I cannot
fast forward, but I deal with it by preparing a patch, resetting, and
applying it afterwards.
I think cherry-pick will do this
2008/10/27 Trevor Daniels <[EMAIL PROTECTED]>:
>> Sometimes there is another commit in between and therefore I cannot
>> fast forward, but I deal with it by preparing a patch, resetting, and
>> applying it afterwards.
>
> I think cherry-pick will do this for you automatically, and
> with less effor
Francisco Vila Monday, October 27, 2008 9:42 AM
2008/10/27 John Mandereau <[EMAIL PROTECTED]>:
On 2008/10/26 23:32 +0100, Francisco Vila wrote:
I'm sure you have noticed that I do a merge of master into
lilypond/translation every few days. I am sorry if this is considered
a pollution of the
2008/10/27 John Mandereau <[EMAIL PROTECTED]>:
> On 2008/10/26 23:32 +0100, Francisco Vila wrote:
>> I'm sure you have noticed that I do a merge of master into
>> lilypond/translation every few days. I am sorry if this is considered
>> a pollution of the history or some kind of inconvenient for any
On 2008/10/26 23:32 +0100, Francisco Vila wrote:
> I'm sure you have noticed that I do a merge of master into
> lilypond/translation every few days. I am sorry if this is considered
> a pollution of the history or some kind of inconvenient for any
> reason. If so, please tell me.
As long as we nee
I'm sure you have noticed that I do a merge of master into
lilypond/translation every few days. I am sorry if this is considered
a pollution of the history or some kind of inconvenient for any
reason. If so, please tell me.
The fact is: in the past I have suffered of an inconvenient
"continuous ou
