git-gui: Correct some state matchings for include/remove.