16 May 18, Alex Korchmar writes to Slawa Olhovchenkov:
SO>> On branch master SO>> Your branch and 'origin/master' have diverged, SO>> and have 2302 and 27893 different commits each, respectively. AK> ой! А как ты это сделал? ;-)
бля. ну я же писал:
% git clone git://github.com/freebsd/freebsd % cd freebsd % git config merge.renamelimit 8000 % git reset --hard 302c1ab5872d36595738b22e5c81f25970497b05 % patch -z '' < ../patch-zfs_arc.c OK % git commit On branch master Your branch and 'origin/master' have diverged, and have 2302 and 27893 different commits each, respectively.