about git non-fast-forward