Permalink
Browse files

more git aliases

  • Loading branch information...
1 parent cc742bc commit 3d489c8c856c143173d16cf09401c1ac5ebec7e8 @myfreeweb committed Feb 11, 2012
Showing with 20 additions and 18 deletions.
  1. +13 −11 gitconfig
  2. +2 −2 quakelive.cfg
  3. +1 −1 vim/bundle/css3
  4. +1 −1 vim/bundle/ctrlp
  5. +1 −1 vim/bundle/fugitive
  6. +1 −1 vim/bundle/gundo
  7. +1 −1 vim/bundle/jade
View
@@ -35,32 +35,34 @@
ui = auto
interactive = auto
[alias]
- a = !git add -A && git status -sb
+ a = !git add --all && git status --short --branch
ca = commit --amend
- ci = commit -a
- cm = commit -am
+ ci = commit --all
+ cm = commit --all -m
co = checkout
+ nb = checkout -b # newbranch
+ br = branch --verbose
cp = cherry-pick -x
- d = diff --color-words head
+ d = diff --color-words --staged
+ dh = diff --color-words head
+ two = diff --color-words HEAD@{1} HEAD@{0}
+ vd = difftool
forget = rm --cached
l = log --oneline --decorate --graph
last = log -n 10 --oneline
mt = mergetool
- nb = checkout -b # newbranch
pu = !git push && git push --tags
rc = rebase --continue
rs = rebase --skip
rwt = reset --hard HEAD # revert working tree
- s = status -sb
+ unci = reset --hard HEAD^ # uncommit
+ s = status --short --branch
+ st = status
sadd = submodule add
smaster = submodule foreach --recursive git checkout master
- st = status
sup = submodule foreach --recursive git pull
- t = tag -n1 -l
+ t = tag -n1 -list
tip = log -n 1
- two = diff --color-words HEAD@{1} HEAD@{0}
- unci = reset --hard HEAD^ # uncommit
- vd = difftool
[url "git://github.com/"]
insteadOf = gh:
[url "git@github.com:myfreeweb/"]
View
@@ -28,8 +28,8 @@ com_maxfps "120"
com_hunkmegs "56"
// Models
-seta cg_forceTeamModel "bitterman"
-seta cg_forceEnemyModel "tankjr/bright"
+seta cg_forceTeamModel "sarge"
+seta cg_forceEnemyModel "keel/bright"
seta model "bitterman"
// Network
Submodule fugitive updated 1 files
+2 −2 plugin/fugitive.vim
Submodule gundo updated 4 files
+1 −0 .hgtags
+25 −19 autoload/gundo.vim
+12 −0 doc/gundo.txt
+15 −0 site/index.html
Submodule jade updated from 981b39 to 77d83a

0 comments on commit 3d489c8

Please sign in to comment.