What are your favorite git aliases? [closed]

Question

What are your favorite git aliases? I know this was somewhat discussed in other git question, I want to get a more specific/focused list of useful aliases...

Feel free to post additional ones for me to update here. It might be better to post one per answer so people get to vote on them independently...

So far:

##
# Abbreviations
git config --global alias.st status
git config --global alias.co checkout
git config --global alias.ci commit
git config --global alias.br branch

##
# Pimp-out log:
# From: http://www.jukie.net/bart/blog/pimping-out-git-log
git config --global alias.lg "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"

##
# Quickly Commit / Uncommit Work-In-Progress
# By David Gageot (http://gist.github.com/492227): 
git config --global alias.wip "git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m \"wip\""
git config --global alias.unwip "git log -n 1 | grep -q -c wip && git reset HEAD~1"

## 
# commit + sign
git config --global alias.cs "commit -s"

Answer 1

[alias]
  panic = !tar cvf ../git_panic.tar *
  co = checkout
  br = branch
  mav = !afplay -s 0 12 ~/Music/iTunes/iTunes\\ Music/Kenny\\ Loggins/Top\\ Gun/Danger\\ Zone.mp3 &\ngit rebase -i  
  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative

usage:

git panic       :when you're a little worried that the world is coming to an end 
git mav HEAD~4  :to interactively rebase the last 4 commits and listen to DangerZone
git lg          :sweet branch visualization in the terminal

Answer 2

I like the ones from David Gageot:

[alias]
  wip = !"git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m \"wip\""
  unwip = !"git log -n 1 | grep -q -c wip && git reset HEAD~1"
  rb = !"git wip;git rebase -i origin/master;git unwip"
  pr = !"git fetch;git wip;git rebase --stat origin;git unwip;git heads"
  head = !"git log -n1"
  lost = !"git fsck | awk '/dangling commit/ {print $3}' | git show --format='SHA1: %C(yellow)%h%Creset %f' --stdin | awk '/SHA1/ {sub(\"SHA1: \", \"\"); print}'"
  heads = !"git log origin/master.. --format='%Cred%h%Creset;%C(yellow)%an%Creset;%H;%Cblue%f%Creset' | git name-rev --stdin --always --name-only | column -t -s';'"

• The wip allows for a quick way to add all new and modified files to the index, while cleaning the index from the files removed from the working tree.
• The unwip will restore the deleted files to the working tree!

A 'wip' "cleaning" facilites the rebase, because there won't be any conlfict due to an "unclean" working directory (not in sync with the index)

Answer 3

I regularly use

fix = commit --amend -C HEAD

when I realize that I made a typo or forgot to include a change in my most recent commit. To use it, either git add the changes that should be added to the top commit and then run git fix, or run git fix with additional arguments that specify what should be included, for example:

git fix FILE1 FILE2     # Add changes to FILE1 and FILE2 to top commit
git fix -a              # Add all changes in working copy to top commit

Answer 4

I basically just abbreviate the command itself so I don't have to type the full thing out.

[alias]
    st = status
    ci = commit
    cia = commit --amend
    co = checkout
    br = branch
    sb = show-branch
    cp = cherry-pick
    staged = diff --cached
    rb = rebase
    rbc = rebase --continue
    rbs = rebase --skip
    rl = reflog
    rs = remote show
    rt = remote
    ru = remote update
    rp = remote prune
    sm = submodule

Answer 5

Sometimes it is useful to detach the HEAD from the current branch, for example when doing a test merge:

detach = checkout HEAD^0

Answer 6

Sadly:

cvs = !git cvsimport -k -a
cvsx = cvsexportcommit -u -p 
cvsxh = cvsexportcommit -u -p -c HEAD

Answer 7

I always sign my commits, got tired of forgetting to type -s

cs = commit -s

Answer 8

I use this one a lot:

gitdc = "git diff --color"

Answer 9

Some commands I use:

This is quite a handy command. It does pretty much everything you want submodules for. However, it works only since git 1.7.1:

sub = submodule update --init --recursive 

You surely have your favorite way to display graph of commits (see git lg described in the question). But sometimes you don't want to open pager. You might want ot add an alias for that:

last = !git --no-pager your-command-to-print-graph -20

Answer 10

Simple aliases, mostly for easier staging/comparing/unstaging:

add = add -v
st = status
staged = diff --staged
unstage = reset HEAD
diff-all = diff HEAD
diff-stat = diff -b --stat

Log commands:

log-graph = log --all --graph --decorate
log-refs = log --all --graph --decorate --oneline --simplify-by-decoration --no-merges
log-timeline = log --format='%h %an %ar - %s'
log-local = log --oneline origin..HEAD
log-fetched = log --oneline HEAD..origin/master