Update cs and gitconfig:
  -cs support -f option
  -gitconfig set vi as default editor