git_remote_helpers / git / __init__.pyon commit merge script: handle --no-ff --no-commit correctly (2a70fa4)
   1