Git 2.23 was released: "git checkout" becomes "git switch" (change branch) and "git restore" (set contents of file to a previous revision). "git checkout" still works (and probably will work forever). https://lwn.net/Articles/796563/