From 31583bc9955ddc698a58803235ec4f3229bc4865 Mon Sep 17 00:00:00 2001 From: JohnE Date: Fri, 12 Feb 2016 16:21:50 -0800 Subject: [PATCH] MOD: updated gitconfig to be more intuitive --- .bash_servers | 2 +- .gitconfig | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bash_servers b/.bash_servers index 7388956..4c8ca21 100644 --- a/.bash_servers +++ b/.bash_servers @@ -1,2 +1,2 @@ # ssh servers -alias malloc='ssh j3g@dev2.malloc.io -D 7891' +alias malloc='ssh j3g@dev.malloc.io -D 7891' diff --git a/.gitconfig b/.gitconfig index 94eb4ae..7a21e4e 100644 --- a/.gitconfig +++ b/.gitconfig @@ -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