Permalink
Browse files

bundle update + aliases

  • Loading branch information...
1 parent ba9038f commit e16b7acc399f3bb2910786d9dfc11433ce0bfd3c @gabesoft committed Jul 31, 2012
View
@@ -136,6 +136,7 @@ alias glt='git lt'
alias gmg='git mg'
alias gms='git ms'
alias gph='git ph'
+alias gpr='git pr'
alias gpm='git pm'
alias gpo='git po'
alias grf='git rf'
View
@@ -1,47 +1,48 @@
[user]
- name = Gabriel Adomnicai
+ name = Gabriel Adomnicai
email = gabesoft@gmail.com
[alias] ; leave at least 2 spaces between the alias name and the equal sign
ad = add -A
- co = checkout
+ br = checkout -b ; create a new branch and switch to it
+ ca = !git add -A "$(git rev-parse --show-cdup)" && git commit -v --amend
; removes files that are not in version control (skips ignored but includes empty directories)
cc = !git checkout "$(git rev-parse --show-toplevel)" && git clean -fd "$(git rev-parse --show-cdup)"
; removes files that are not in version control (includes ignored and empty directories)
ccc = !git checkout "$(git rev-parse --show-toplevel)" && git clean -fdx "$(git rev-parse --show-cdup)"
cf = cat-file -p
- rf = rm -f ; delete force (for files)
- rr = rm -r ; delete recursively (for directories)
- rs = rm --cached ; delete from staging
- st = status
- ci = !git add -A "$(git rev-parse --show-cdup)" && git commit -av
- ca = !git add -A "$(git rev-parse --show-cdup)" && git commit -v --amend
- br = checkout -b ; create a new branch and switch to it
- ms = checkout master
- mg = merge
ch = diff --name-status -r
+ ci = !git add -A "$(git rev-parse --show-cdup)" && git commit -av
+ co = checkout
df = diff
- ds = diff --staged
dm = difftool --tool=mvimdiff
+ ds = diff --staged
dv = difftool --tool=vimdiff
- po = push origin
- pm = push origin
- ph = push heroku
+ fw = log --follow ; file commit history needs to be followed by a file path
+ gb = gui blame ; gui interface to git blame needs to be followed by a file path
+ last = log -p -1 HEAD
+ ld = log -p ; show log with diffs (add -x to show only the x most recent entries)
lf = ls-files -s
+ lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
+ lo = log --color --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
lr = ls-remote
- gb = gui blame ; gui interface to git blame needs to be followed by a file path
+ ls = log --decorate --pretty=oneline --stat
+ lt = !git --no-pager log --color --decorate --pretty=format:'%Cred%h%Creset %C(cyan)%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)' --abbrev-commit -30 && git --no-pager log --pretty=format:'%n' -1
+ mg = merge
+ ms = checkout master
+ ph = push heroku
+ pm = push origin
+ po = push origin
+ pr = pull --rebase
+ rf = rm -f ; delete force (for files)
rh = reset HEAD --
- su = stash ; stash push
+ rr = rm -r ; delete recursively (for directories)
+ rs = rm --cached ; delete from staging
so = stash pop ; stash pop
- last = log -p -1 HEAD
+ st = status
+ su = stash ; stash push
undo = reset --hard HEAD~
alias = !cat ~/.gitconfig | awk '/^[ \t]{2}[a-z]+[ \t]{2,4}=/'
- ld = log -p ; show log with diffs (add -x to show only the x most recent entries)
- ls = log --decorate --pretty=oneline --stat
- fw = log --follow ; file commit history needs to be followed by a file path
- lo = log --color --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
- lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
- lt = !git --no-pager log --color --decorate --pretty=format:'%Cred%h%Creset %C(cyan)%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)' --abbrev-commit -30 && git --no-pager log --pretty=format:'%n' -1
[core]
editor = mvim -f
View
@@ -102,12 +102,12 @@ setlocal nowinfixwidth
setlocal nowrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 44 - ((29 * winheight(0) + 30) / 60)
+let s:l = 1 - ((0 * winheight(0) + 30) / 60)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
-44
-normal! 073l
+1
+normal! 0
lcd /apps/blogmon/lib
let &so = s:so_save | let &siso = s:siso_save
doautoall SessionLoadPost
Oops, something went wrong.

0 comments on commit e16b7ac

Please sign in to comment.