.bashrc: Add /native/usr dirs to $PATH on SmartOS
[dotfiles.git] / .gitconfig
index 7ec21c98943ff2bc7d8ca23284c582dfc33706fe..30a3de5982fc0eb3a02c5e0428457bc6f2b80417 100644 (file)
        co           = checkout
        tags         = tag -n1 -l
        # Log helpers
-       ll           = log     --pretty='format:%C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
+       ll           = 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'
        # Remote helpers
-       track        = !git-track
-       incoming     = !git-incoming
        in           = !git-incoming
-       outgoing     = !git-outgoing
        out          = !git-outgoing
        # Branch helpers
-       bd           = !git-brdate
+       bd           = !git-branch-dates
        bv           = !git branch --color -vv
-       cv           = !git-cv
-       subtree      = !git-subtree
+       cv           = !git-cherry-view
        # Diff helpers
        df           = diff --patience
        dfc          = diff --patience --cached
+       dfw          = diff --patience --word-diff=plain
        # Searching
        ls           = ls-files
        ack          = !git-ack
@@ -34,8 +31,6 @@
        sup          = !git-subup pull
        # Misc
        root         = rev-parse --show-toplevel
-       sh           = !git-sh
-       thanks       = !git-thanks
        who          = shortlog -s --
        fp           = format-patch --stdout
 
        remote = green
        plain = red bold
 
+[color "decorate"]
+       branch = green bold
+       remoteBranch = green
+
 [color "status"]
        added = yellow
        changed = green bold