I also use https://github.com/mhinz/vim-signify, which in addition to nice visuals provides a SignifyHunkUndo command to do just that
SignifyHunkUndo