- `ls` for `ls-files`
- `lo` for `git log --oneline`, then add a variety of letters in multiple combinations like
- `r` for `--reverse`,
- `s` for `--stat`,
- `om` for `origin/master..`,
- `1` for `-n1`, `2` for `-n2`, `3` for `-n3` (maybe up to 5),
- `rbi` for `rebase -i`,
- `rbiom` for `rebase -i origin/master`,
- `rbc` for `rebase --continue`
- `rba` for `rebase --abort`
- `cp` for `cherry-pick`,
- `cpa` for `cherry-pick --abort`,
- `cpc` for `cherry-pick --continue`
I also have _shell_ aliases like `gits` that works out to `git status -uno`, and `gita` that lets me add tracked files. I need a `gitca` for `EDITOR=true git commit --amend`.
Notice I don't have aliases for merging. I use strictly rebase and cherry-pick workflows.
Notice I don't have aliases for merging. I use strictly rebase and cherry-pick workflows.