Permalink
Browse files

personal adjustments

  • Loading branch information...
1 parent 22f0bcf commit f3f071b6ec099e70e1b1286116059615d7f521df @emischorr emischorr committed Feb 25, 2012
Showing with 11 additions and 5 deletions.
  1. +1 −1 git/aliases.zsh
  2. +7 −3 git/gitconfig.symlink.example
  3. +2 −0 zsh/aliases.zsh
  4. +1 −1 zsh/zshrc.symlink
View
@@ -24,6 +24,6 @@ alias gd='git diff'
alias gc='git commit'
alias gca='git commit -a'
alias gco='git checkout'
-alias gb='git branch'
+alias gb='git branch -avv'
alias gs='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
@@ -7,16 +7,20 @@
# To set this up, rename this file to `gitconfig.symlink` and you'll be able to
# install this to the correct location by running the project's main `rake`
# task.
+#[http]
+# proxy = http://proxy.domain.com:80
+
[user]
- name = Zach Holman
- email = your@example.com
+ name = Enrico Mischorr
+ email = enrico@mischorr.de
[alias]
co = checkout
promote = !$ZSH/bin/git-promote
wtf = !$ZSH/bin/git-wtf
rank-contributers = !$ZSH/bin/git-rank-contributers
count = !git shortlog -sn
[color]
+ ui = true
diff = auto
status = auto
branch = auto
@@ -26,6 +30,6 @@
[apply]
whitespace = nowarn
[github]
- user = holman
+ user = micralon
[mergetool]
keepBackup = false
View
@@ -1 +1,3 @@
alias reload!='. ~/.zshrc'
+alias x='exit'
+alias ..='cd ..'
View
@@ -2,7 +2,7 @@
export ZSH=$HOME/.dotfiles
# your project folder that we can `c [tab]` to
-export PROJECTS=~/Development
+export PROJECTS=~/workspace
# source every .zsh file in this rep
for config_file ($ZSH/**/*.zsh) source $config_file

0 comments on commit f3f071b

Please sign in to comment.