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