Permalink
Browse files

Merge branch 'master' of github.com:jpr5/env

  • Loading branch information...
2 parents ba59716 + f1c2391 commit 752c4bab87f874199a2cb686fb286c7dcab08495 @jpr5 jpr5 committed Nov 23, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 .gitconfig
View
6 .gitconfig
@@ -14,9 +14,9 @@
up = remote -v update -p
sub = submodule
remotes = remote -v show
- m = !B=$(git branch | grep '*' | awk '{print $2}') && R=$(git config branch.$B.remote) && RB=$(git config branch.$B.merge | cut -d/ -f3) && git merge $R/$RB
- d = !B=$(git branch | grep '*' | awk '{print $2}') && R=$(git config branch.$B.remote) && RB=$(git config branch.$B.merge | cut -d/ -f3) && git wc $B..$R/$RB
- rd = !B=$(git branch | grep '*' | awk '{print $2}') && R=$(git config branch.$B.remote) && RB=$(git config branch.$B.merge | cut -d/ -f3) && git wc $R/$RB..$B
+ m = !B=$(git branch | grep '*' | awk '{print $2}') && R=$(git config branch.$B.remote) && RB=$(git config branch.$B.merge | cut -d/ -f3-) && git merge $R/$RB
+ d = !B=$(git branch | grep '*' | awk '{print $2}') && R=$(git config branch.$B.remote) && RB=$(git config branch.$B.merge | cut -d/ -f3-) && git wc $B..$R/$RB
+ rd = !B=$(git branch | grep '*' | awk '{print $2}') && R=$(git config branch.$B.remote) && RB=$(git ) && git wc $R/$RB..$B
human = name-rev --name-only --refs=refs/heads/*
humin = name-rev --name-only --refs=refs/heads/* --stdin
[color]

0 comments on commit 752c4ba

Please sign in to comment.