[dmd-internals] Automatic Pull Merging!

[Leandro Lucarella]

Martin Nowak, el 16 de November a las 13:10 me escribiste:
> Jacob Carlborg <doob at me.com> schrieb:
> >I completely agree. The default should be a fast forward then there
> >should be an option to select non fast forward next to the merge
> >button.
> 
> I don't agree. It's helpful to preserve the information that something
> was merged, which commits were part of the merge and most importantly
> a reference to the github issue in the merge request.

BTW, I just changed the git-hub tool to force the rebase, so you'll
always get the committer information updated when *rebasing* a pull
request. This way you get to keep the date and person that pushed the
commits upstream.

Feel free to try it out and report any problems:
https://github.com/sociomantic/git-hub/releases/tag/v0.6.0-rc1

-- 
Leandro Lucarella (AKA luca)                     http://llucax.com.ar/
----------------------------------------------------------------------
GPG Key: 5F5A8D05 (F8CD F9A7 BF00 5431 4145  104C 949E BFB6 5F5A 8D05)
----------------------------------------------------------------------
Decile que ponga "rails generate tp_prof_fiuba" en la consola y en una
semana se recibe.
	-- Mazzi, filósofo estilista