bin/git-subup: Force "git checkout master" foreach submodule
[dotfiles.git] / .gitconfig
index a81297e54ffbcb26ddb8266d3f5324eda00b7826..78a06bd04a9fc72e15c42d7717e8a17930ff50e3 100644 (file)
@@ -3,27 +3,43 @@
        email = tony@nynim.org
 
 [alias]
-       sh     = !git-sh
-       grab   = !githug-grab
-       thanks = !git-thanks
-       cv     = !git-cv
-       track  = !git-track
-       ll = log --pretty=oneline --abbrev-commit --max-count=15
-       review = log -p --max-count=1
-       fp = format-patch --stdout
-       ci = commit
-       st = status
-       br = branch
-       co = checkout
-       df = diff
-       lg = log -p
-       who = shortlog -s --
-       brdate = !git-brdate
-       subtree = !git-subtree
+       browse       = !hub browse
+       w            = !hub browse
+       compare      = !hub compare
+       cb           = !git-cut-branch
+       sh           = !git-sh
+       grab         = !github-grab
+       thanks       = !git-thanks
+       track        = !git-track
+       root         = rev-parse --show-toplevel
+       ll           = log -16 --pretty='format:%C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
+       lll          = log     --pretty='format:%C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
+       graph        = log --all --graph --topo-order --pretty='format:%C(yellow)%h%Creset %s %C(black bold)(by %an)%Creset%C(green bold)%d%Creset%n'
+       review       = log -p --max-count=1
+       fp           = format-patch --stdout
+       ci           = commit
+       st           = status
+       br           = branch
+       co           = checkout
+       cv           = !git-cv
+       lg           = log -p
+       who          = shortlog -s --
+       bd           = !git-brdate
+       bv           = !git branch --color -v | cut -c1-100
+       incoming     = !git-incoming
+       in           = !git-incoming
+       outgoing     = !git-outgoing
+       out          = !git-outgoing
+       subtree      = !git-subtree
+       sup          = !git-subup
+       df           = diff --patience
+       di           = diff --patience --cached
 
 [core]
        filemode = true
+       logallrefupdates = true
        whitespace = space-before-tab, trailing-space
+       excludesfile = ~/.gitignore_global
 
 [diff]
        renames = copies