The thing that gets me every time is the git sub-commands which have multiple orthogonal uses, without so much as a command line flag to differentiate them.

    git reset abc  # unstage file `abc`
    git reset xyz  # switch to commit `xyz`

or:

    git checkout mybranch  # switch to branch `mybranch`
    git checkout myfile    # remove any local changes to `myfile` since the last commit

---

Maybe this would work great in a typed language where I might have `reset(File x)` and `reset(Commit x)` with different signatures... but for a CLI where everything is stringly-typed? Not so fun.

Also, god knows what happens here if there's a branch name with the same name as a file...