clean up git aliases

fix update rake task
(cherry picked from commit 805b75ea176465dec6aeff1cae7a0da1b5c4c28e)