On 01/13/2012 10:22 AM, Simon Riggs wrote:
> On Fri, Jan 13, 2012 at 2:26 PM, Magnus Hagander<magnus(at)hagander(dot)net> wrote:
>
>> Just FWIW, I use a separate development repository as well. But I have
>> it added as a remote from the "commit repository", and thus just do a
>> "git merge --squash" instead of manually moving them with "patch".
>>
>> But I am very much a fan of keeping the repos separate for just that
>> reason - don't want to accidentally commit dev code.
> OK thanks.
>
> My patch foo seems occasionally faulty, but git merge --disaster is
> something I'm happy to avoid. I'll work on my hand grenade juggling
> skills before I do that.
How you work is up to you, but "git merge --squash" is pretty safe,
since it doesn't actually commit anything.
cheers
andrew