Some of my aliases, first some basic shortcuts: freshen = commit --amend --no-edit --date=now cont = rebase --continue br = branch --column recent = br

Some of my aliases, first some basic shortcuts: freshen = commit --amend --no-edit --date=now cont = rebase --continue br = branch --column recent = branch --sort=committerdate idiff = diff --cached ff = merge --ff-only co = checkout Show what's left to do in an interactive rebase: todo = !cat `git rev-parse --git-dir`/rebase-merge/git-rebase-todo Set tracking to to origin/<the same branch name> upstream = !zsh -c 'git branch --set-upstream-to=origin/$(git symbolic-ref --short HEAD) $(git symbolic-ref --short HEAD)' I use this to swap my work to home e-mail or vice-versa if I've got it wrong. Need to specify an initial commit. allmine = filter-branch --env-filter 'GIT_COMMITTER_EMAIL=my@email.com GIT_AUTHOR_EMAIL=my@email.com' vim = "!gvim `git ls-files -m`"