Re: xonsh-devel broken

2016-12-21 Thread Andrea D'Amore
On 21 December 2016 at 21:54, Marko Käning wrote: > On 21 Dec 2016, at 21:51 , Daniel J. Luke wrote: >> yep, I just pushed a fix for the missing \ in the description in the subport. > :) Just wanted to push that fix myself, but you beat me there! Be honest, you guys are just scared of my push-fu

Unintentional double commits

2016-12-21 Thread Andrea D'Amore
While trying to push a small change (shell/xonsh) I managed to rebase AND merge the about 300 commits since my previous update, as a results those 300 commits in master now are "duplicated". The files in master are unaltered, except for the actual portfile I was pushing, but the history is now mes