git ff = fast forward, ff = fetch & fast forward