mikegerwitz
/
git-shortmaps
1
0
Fork 0
Code Releases Activity

`Pr` and `Prp` shortmaps will now preserves merges

master
Mike Gerwitz 2014-06-18 10:30:30 -04:00
parent 19a7272dca
commit 22f82993bd
No known key found for this signature in database
GPG Key ID: F22BB8158EE30EAB
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -39,8 +39,8 @@ By default, the following mappings are available, each with tab completion:
* `ma` - git merge --abort
* `p` - git push
* `P` - git pull
* `Pr` - git pull --rebase
* `Prp` - git pull --rebase && git push
* `Pr` - git pull --rebase=preserve
* `Prp` - git pull --rebase=preserve && git push
* `R` - git rebase
* `Ri` - git rebase --interactive
* `Ra` - git rebase --abort

4
shortmaps
View File

@ -18,8 +18,8 @@ m _git_merge :merge
ma : :merge --abort
p _git_push :push
P _git_pull :pull
Pr _git_pull :pull --rebase
Prp _git_pull |git pull --rebase && git push
Pr _git_pull :pull --rebase=preserve
Prp _git_pull |git pull --rebase=preserve && git push
R __git_rebase :rebase
Ri _git_rebase :rebase --interactive
Ra _git_rebase :rebase --abort