On 12/11/12, H. S. Teoh <hsteoh at quickfur.ath.cx> wrote: > P.S. And also, http://wiki.dlang.org/Pull_Requests I never needed to use "pull --ff-only", all I do to rebase is "git pull --rebase upstream master", it never messed with my history as far as I'm aware.