Remove local changes, stash (dirty working directory)

$ git pull
X11 forwarding request failed on channel 0
Updating 5fa37a1..b8c2ccd
error: Your local changes to the following files would be overwritten by merge:
        test/unitTestFioObj.fio
Please commit your changes or stash them before you merge.
Aborting

$ git stash push
  Stash the changes in a dirty working directory away  

$ git stash show  
 test/unitTestFioObj.fio | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

$ git pull
X11 forwarding request failed on channel 0
Updating 5fa37a1..b8c2ccd
Fast-forward
 test/unitTestFioObj.fio | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)