tiegz · August 29, 2015 14:01 · May 5, 2014 · May 5, 2014 · May 5, 2014
diff --git a/.gitconfig b/.gitconfig
@@ -25,7 +25,7 @@
   d  = diff
   cp = cherry-pick
   pl = pull
-
+  f = fetch
 
   # Logging
   l  = log --pretty=format:'%C(yellow)%h%Creset - %C(green)%an%Creset %C(cyan)%d %C(reset)%s %Cgreen(%cr)%Creset' --graph

diff --git a/.gitconfig b/.gitconfig
@@ -1,6 +1,6 @@
 # Inspired by https://github.com/gabebw/dotfiles/blob/master/gitconfig.erb
 [user]
-  name = Aaron Suggs
+  name = Tieg Zaharia
   email = XXX
 [core]
   excludesfile = ~/.gitignore

diff --git a/.gitconfig b/.gitconfig
@@ -0,0 +1,100 @@
+# Inspired by https://github.com/gabebw/dotfiles/blob/master/gitconfig.erb
+[user]
+  name = Aaron Suggs
+  email = XXX
+[core]
+  excludesfile = ~/.gitignore
+[apply]
+  whitespace = nowarn
+[diff]
+  color = auto
+[pager]
+  color = true
+[status]
+  color = auto
+[alias]
+  # Save keystrokes
+  m = checkout master
+  ci = commit -a
+  ca = commit --amend
+  co = checkout
+  st = status
+  br = branch
+  b  = branch
+  c  = clone
+  d  = diff
+  cp = cherry-pick
+  pl = pull
+
+
+  # Logging
+  l  = log --pretty=format:'%C(yellow)%h%Creset - %C(green)%an%Creset %C(cyan)%d %C(reset)%s %Cgreen(%cr)%Creset' --graph
+  lg = log --pretty=format:'%C(yellow)%h%Creset - %C(green)%an%Creset %C(cyan)%d %C(reset)%s %Cgreen(%cr)%Creset' --stat
+  fat-snake = log --pretty=format:'' --graph
+  r  = !git l -30
+  ra = !git r --all
+  la = !git l --all
+  rom = rebase origin/master
+
+  # When I'm confused about changes that are staged
+  huh = diff HEAD
+
+
+  # The best way to pull
+  plr = pull --rebase
+  plre = pull --rebase
+  up = !git fetch origin && git rebase origin/master
+  ps = push
+  publish = "!f() { git push -u origin `git rev-parse --abbrev-ref head`; }; f"
+  ss = log -n 1 --format="%h" # Show short sha
+  pb = !git log -n 1 --format="%H" -z | pbcopy # Copy sha to pasteboard
+  x = !github
+  hub = !github
+  smu = !git submodule sync && git submodule update --init
+  backout = reset head^
+
+  # Handy for publishing gems
+  #   git release v1.0.0
+  release = "!f() { git tag -a -m $1 $1 && git push origin tag $1; }; f"
+
+[color]
+  branch = auto
+  diff = auto
+  status = auto
+[color "branch"]
+  current = yellow reverse
+  local = yellow
+  remote = green
+[color "diff"]
+  meta = yellow bold
+  frag = magenta bold
+  old = red bold
+  new = green bold
+[color "status"]
+  added = yellow
+  changed = green
+  untracked = cyan
+[diff]
+  # For Github-style word diffs
+  wordRegex = [^[:space:]]
+[github]
+  user = ktheory
+  token = XXX
+[gitflow]
+  base = master
+  release = release
+[push]
+  default = simple
+[branch]
+  autosetuprebase = always
+[url "git://github.com/"]
+  # Read-only
+  insteadOf = gh:
+[url "[email protected]:"]
+  # With write access
+  insteadOf = wgh:
+[credential]
+  helper = osxkeychain
+[filter "media"]
+	clean = git-media-clean %f
+	smudge = git-media-smudge %f
No results found