Permalink
Browse files

Add a bit more config for git (aliases, rerere, heroku account)

  • Loading branch information...
1 parent 350081e commit 320cd97b9500ce25009d9a8a731c923579d7aa8b @drogus committed May 2, 2011
Showing with 23 additions and 2 deletions.
  1. +18 −2 gitconfig.erb
  2. +5 −0 gitignore
View
@@ -1,8 +1,6 @@
[user]
name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
-[alias]
- co = checkout
[color]
diff = auto
status = auto
@@ -18,3 +16,21 @@
[github]
user = <%= print("GitHub Username: "); STDOUT.flush; STDIN.gets.chomp %>
token = <%= print("GitHub API Token: "); STDOUT.flush; STDIN.gets.chomp %>
+[alias]
+ shift = !$HOME/bin/git-shift
+ co = checkout
+ plre = pull --rebase
+ pl = pull
+ ps = push
+ ca = commit -a
+ ci = commit
+ ln = log --no-merges
+ lno = log --no-merges --pretty=oneline
+ st = status
+ br = branch
+ unstage = reset HEAD --
+ last = log -1 HEAD
+[rerere]
+ enabled = 1
+[heroku]
+ account = personal
View
@@ -2,3 +2,8 @@
.svn
*~
.*.swp
+.idea
+.rvmrc
+.*.swo
+*#
+.#*

0 comments on commit 320cd97

Please sign in to comment.