--- a/.hgsubstate Fri Mar 18 15:29:58 2022 -0400
+++ b/.hgsubstate Tue Apr 05 10:54:24 2022 -0400
@@ -34,7 +34,7 @@
aa1f120ad3a29c27cc41d581cda3751c59343cce vim/bundle/surround
19c3d966440b6cfe8d74251881a48e961ddb8648 vim/bundle/swig
f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets
-2c6bffb492f4f9b101e45610b0d7b9c328916894 vim/bundle/vim-go
+dcefd64ba251ffc3d497f8758036735c8f6cc824 vim/bundle/vim-go
5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
54feb567738398ab65d783e096bc84938e7620a0 vim/bundle/vlime
6876fe38b33732cb124d415ffc4156f16da5e118 vim/bundle/windowswap
--- a/gitconfig Fri Mar 18 15:29:58 2022 -0400
+++ b/gitconfig Tue Apr 05 10:54:24 2022 -0400
@@ -86,6 +86,7 @@
fuo = "!sh -c 'git fo && git uo' -"
fuom = "!sh -c 'git co $(git mainbranch) && git fo && git uo' -"
fuum = "!sh -c 'git co $(git mainbranch) && git fu && git uu' -"
+ rom = "!sh -c 'git fo && git rebase origin/$(git mainbranch)' -"
addremove = !git add . && git add -u
addrem = !git addremove--- a/vim/vimrc Fri Mar 18 15:29:58 2022 -0400
+++ b/vim/vimrc Tue Apr 05 10:54:24 2022 -0400
@@ -462,10 +462,6 @@
" Unfuck my screen
nnoremap U :syntax sync fromstart<cr>:redraw!<cr>
-" Pushing
-nnoremap <leader>Go :Start! git push origin<cr>
-nnoremap <leader>Gu :Start! git push upstream<cr>
-
" Open current directory in Finder
nnoremap <leader>O :!open .<cr>
@@ -1969,6 +1965,8 @@
nnoremap <leader>gci :Gcommit<cr>
nnoremap <leader>gm :Gmove<cr>
nnoremap <leader>gr :Gremove<cr>
+nnoremap <leader>gpo :!git push origin<cr>
+nnoremap <leader>gpu :!git push upstream<cr>
nnoremap <leader>gl :Clam git gll -100 \| stripcolor<cr>