Browse files

Tidy 'git st', add 'plre' and 'remaster'. Remove gist url shortcuts

  • Loading branch information...
1 parent 3bfb0f3 commit 8aef8d5294916b82b065965b3b4496096f8bec0c @jyurek committed Oct 18, 2011
Showing with 3 additions and 7 deletions.
  1. +3 −7 gitconfig
View
10 gitconfig
@@ -8,7 +8,7 @@
pager = true
status = true
[alias]
- st = status
+ st = status -sb
co = checkout
c = commit -m
a = !git add . && git status
@@ -20,6 +20,8 @@
amend = commit --amend
cs = commit --amend -C HEAD
ch = cherry -v
+ plre = pull --rebase
+ remaster = rebase master
pick = cherry-pick
child-of = !sh -c '([[ $(git merge-base $1 $0) == $(git log -n 1 --format="%H" $0) ]] && echo "$0 is a child of $1") || echo "$0 is not a child of $1"'
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue%an%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
@@ -46,12 +48,6 @@
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:"
[push]

0 comments on commit 8aef8d5

Please sign in to comment.