[dmd-internals] Halp! need help fixing git master for dmd

Leandro Lucarella luca at llucax.com.ar
Fri Feb 21 21:22:26 PST 2014


Daniel Murphy, el 21 de February a las 20:40 me escribiste:
> You had an old master, with your testCols commit on top.  Then you merged
> upstream master into it.  Then you pushed that merge commit to upstream,
> accidentally.
> 
> When you 'fixed' it, you made the testCols commit the new master.  This
> discarded all the changes from the upstream master. (from the last day or
> so)
> 
> Luckily this doesn't seem to happen very often.  To make this less likely,
> I recommend you do not pull from upstream master manually, and you instead
> have a sh/batch file that runs: `git pull upstream master --ff-only` which

You could also use an alias:
git config alias.update 'pull upstream master --ff-only'
Then `git update` will do that for you.


-- 
Leandro Lucarella (AKA luca)                     http://llucax.com.ar/
----------------------------------------------------------------------
Yo soy peperino el que siempre pone el vino, yo soy aquel que come los
huevos con tocino.
	-- Peperino Pómoro


More information about the dmd-internals mailing list