Permalink
Browse files

git stuff

  • Loading branch information...
1 parent b9d609b commit 0f287d7b2e318112c47ce7553cd71544febbb91f @dougm committed Oct 26, 2012
Showing with 21 additions and 6 deletions.
  1. +1 −0 home/.bashrc
  2. +17 −6 home/.gitconfig
  3. +3 −0 home/.gitignore
View
@@ -42,6 +42,7 @@ alias ls="$ls \$LS_OPTIONS -hF"
alias ll="$ls \$LS_OPTIONS -lhF"
alias l="$ls \$LS_OPTIONS -lAhF"
alias grep='grep --color'
+alias ec='emacsclient -t'
if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
. /etc/bash_completion
View
@@ -2,10 +2,16 @@
name = Doug MacEachern
email = dougm@vmware.com
[color]
- diff = auto
- branch = auto
+ grep = auto
+ ui = auto
interactive = auto
+ branch = auto
+ diff = auto
status = auto
+[color "sh"]
+ branch = yellow reverse
+ workdir = blue bold
+ dirty = red
[core]
excludesfile = ~/.gitignore
whitespace = trailing-space,space-before-tab
@@ -19,12 +25,17 @@
br = branch
mr = merge --no-ff
fuckthis = checkout -f
+ graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(cyan)(%an)%Creset' --abbrev-commit --date=relative
+ lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
+ log-all = log --graph --all --color --pretty='%x09%h %cn%x09%s %Cred%d%Creset'
+ changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
+ short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
+ changelog = log --pretty=format:\" * %s\"
+ shortnocolor = log --pretty=format:\"%h %cr %cn %s\"
+ incoming = !git fetch && git log ..origin/master
+ outgoing = !git fetch && git log origin/master..
[branch]
autosetupmerge = true
-[color "sh"]
- branch = yellow reverse
- workdir = blue bold
- dirty = red
[merge]
renameLimit = 999999
tool = ediff
View
@@ -1 +1,4 @@
*~
+*.test
+*.dat
+TAGS

0 comments on commit 0f287d7

Please sign in to comment.