On Thu, Oct 27, 2011 at 09:14:10AM +0200, David Kastrup wrote:
> P.S.: After thinking about it, I decided I don't want to try to fix this
> part of the history.
+1. It's just too risky to mess with git.
> In future, rebase using --preserve-merges, and sorry for not noticing
> this earlier.
will
David Kastrup writes:
> I think adding --preserve-merges should help. The alternative is
> --no-ff which refuses to do anything if master has separate commits.
P.S.: After thinking about it, I decided I don't want to try to fix this
part of the history. If my playing around with dev/staging is
Graham Percival writes:
> On Thu, Oct 27, 2011 at 07:36:23AM +0200, David Kastrup wrote:
>> Can you figure out what steps you did for pushing staging to master,
>> perhaps using the reflog or other personal history? I made sure that I
>> had a merge commit in staging for doing the tuning work.
>
On Thu, Oct 27, 2011 at 07:36:23AM +0200, David Kastrup wrote:
> Can you figure out what steps you did for pushing staging to master,
> perhaps using the reflog or other personal history? I made sure that I
> had a merge commit in staging for doing the tuning work.
I copied&pasted from a previous
Graham Percival writes:
> On Wed, Oct 26, 2011 at 03:55:13PM +0200, David Kastrup wrote:
>> Graham Percival writes:
>>
>> > that is a concern, but I have no energy left to be concerned about it.
>> > Note that merging from dev/staging to master will be completely
>> > automatic (including the t
