From 6cbf2bbbde6e709b0aa954554ce3908065ca6adf Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Wed, 23 Nov 2016 23:10:54 -0500 Subject: [PATCH] Add pf Now that --force-with-lease is a thing, we can have a shortmap that does something sane rather than blowing changes away. * shortmaps (pf): Add shortmap. --- shortmaps | 1 + 1 file changed, 1 insertion(+) diff --git a/shortmaps b/shortmaps index 3616bf4..b4518cf 100644 --- a/shortmaps +++ b/shortmaps @@ -34,6 +34,7 @@ Mu _git_submodule :submodule update --recursive MP _git_submodule :submodule update --remote --recursive p _git_push :push pd- : |ref="$( git rev-parse --symbolic-full-name @{-1} )"; git push "${1:-origin}" :"${ref#refs/heads/*}" +pf _git_push :push --force-with-lease pu _git_push :push --set-upstream P _git_pull :pull Pr _git_pull :pull --rebase=preserve