From ec581a469b2cfe5d19bb351d6dac020433fa642d Mon Sep 17 00:00:00 2001
From: Mari Wahl <mari.wahl9@gmail.com>
Date: Tue, 29 Jul 2014 12:33:29 -0400
Subject: [PATCH] gitconfig, aliases

---
 README.md         |  3 --
 configs/aliases   | 23 ++++++++++++++
 configs/gitconfig | 79 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+), 3 deletions(-)
 create mode 100644 configs/aliases
 create mode 100644 configs/gitconfig

diff --git a/README.md b/README.md
index ae0b253..7d305b4 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,6 @@ Many bash scripts, examples and useful stuff.
 
 
 
-
-[Fedora Tricks and Configs](https://mariwahl.hackpad.com/ulruigl2Fwd#Fedora-Tricks-and-Configs)
-
 [Linux Tricks and Configs](https://mariwahl.hackpad.com/dtzOUsZaQMo#Linux-Tricks-and-Configs)
 
 [Sublime Tricks and Configs](https://mariwahl.hackpad.com/RT6R3ZWEl7j#Sublime-Tricks-and-Configs)
diff --git a/configs/aliases b/configs/aliases
new file mode 100644
index 0000000..7d7ab6b
--- /dev/null
+++ b/configs/aliases
@@ -0,0 +1,23 @@
+# Dir navigation
+alias ll='tree --dirsfirst -ChFupDaLg 1'
+
+# Utilities
+alias a="ack -ia"
+alias b="bundle exec"
+alias c="pygmentize -O style=monokai -f console256 -g"
+alias d="du -h -d=1"
+alias df="df -h"
+alias g="git"
+alias grep='GREP_COLOR="1;37;45" LANG=C grep --color=auto'
+alias h="history"
+alias httpdump="sudo tcpdump -i en1 -n -s 0 -w - | grep -a -o -E \"Host\: .*|GET \/.*\""
+alias ip="curl -s http://checkip.dyndns.com/ | sed 's/[^0-9\.]//g'"
+alias localip="ipconfig getifaddr en1"
+alias mp="mvim -p"
+alias rkt="racket -il xrepl"
+alias tmux="tmux -2"
+
+
+# Sync
+#alias sync_irc="rsync -avz ~/Sites/IRC/ talos:/mnt/www/irc.gf3.ca/public"
+
diff --git a/configs/gitconfig b/configs/gitconfig
new file mode 100644
index 0000000..ddad0ba
--- /dev/null
+++ b/configs/gitconfig
@@ -0,0 +1,79 @@
+[user]
+	name = Mari Wahl
+	email = mari.wahl9@gmail.com
+
+
+[alias]
+  br  = branch
+  ci  = commit
+  co  = checkout
+  df  = diff
+  g   = grep -I
+  lg  = log -p
+  loq = log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold white)— %an%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit --date=relative
+  pb  = publish-branch
+  rb  = rbranch
+  rc  = rank-contributors
+  rv  = review
+  sm  = show-merges
+  st  = status
+
+[branch]
+  autosetuprebase = always
+
+[color]
+  ui = auto
+
+[color "branch"]
+  current = yellow reverse
+  local   = yellow
+  remote  = green
+
+[color "diff"]
+  meta = yellow
+  frag = magenta
+  old  = red
+  new  = green
+
+[color "status"]
+  added     = yellow
+  changed   = green
+  untracked = cyan
+
+[diff]
+  tool = Kaleidoscope
+
+[diff "exif"]
+  textconv = exiftool
+
+[difftool]
+  prompt = false
+
+[merge]
+  log = true
+
+[push]
+  default = simple
+
+[rerere]
+  enabled = 1
+
+[url "git@github.com:"]
+  insteadOf     = "gh:"
+  pushInsteadOf = "github:"
+  pushInsteadOf = "git://github.com/"
+
+[url "git://github.com/"]
+  insteadOf = "github:"
+
+[url "git@gist.github.com:"]
+  insteadOf     = "gst:"
+  pushInsteadOf = "gist:"
+  pushInsteadOf = "git://gist.github.com/"
+
+[url "git://gist.github.com/"]
+  insteadOf = "gist:"
+
+[url "git@heroku.com:"]
+  insteadOf = "heroku:"
+