j3g
/
osxenv_pub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MOD: updated gitconfig to be more intuitive

This commit is contained in:
JohnE 2016-02-12 16:21:50 -08:00
parent 598ef02229
commit 31583bc995
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bash_servers
View File

@ -1,2 +1,2 @@
# ssh servers # ssh servers
alias malloc='ssh j3g@dev2.malloc.io -D 7891' alias malloc='ssh j3g@dev.malloc.io -D 7891'

12
.gitconfig
View File

@ -82,7 +82,7 @@
############# #############
mt = mergetool mt = mergetool
############# #############
pr = prune -v pn = prune -v
############# #############
ps = push ps = push
psf = push -f psf = push -f
@ -97,11 +97,11 @@
plom = pull origin master plom = pull origin master
plpm = pull upstream master plpm = pull upstream master
############# #############
pb = pull --rebase pr = pull --rebase
pbo = pull --rebase origin pro = pull --rebase origin
pbp = pull --rebase upstream prp = pull --rebase upstream
pbom = pull --rebase origin master prom = pull --rebase origin master
pbpm = pull --rebase upstream master prpm = pull --rebase upstream master
############# #############
rb = rebase rb = rebase
rba = rebase --abort rba = rebase --abort