diff --git a/symlinks/config/fish/config.fish b/symlinks/config/fish/config.fish index 62f2bb7..d08af48 100644 --- a/symlinks/config/fish/config.fish +++ b/symlinks/config/fish/config.fish @@ -23,6 +23,8 @@ else end abbr -a batdiff "git diff --name-only --diff-filter=d | xargs bat --diff" +abbr -a ggpush "git push origin (__git.current_branch)" +abbr -a ggpull "git pull origin (__git.current_branch)" source ~/.config/fish/platform_config/$MACHINE_TYPE.fish diff --git a/symlinks/config/fish/fish_variables b/symlinks/config/fish/fish_variables index 1d1894e..0f28269 100644 --- a/symlinks/config/fish/fish_variables +++ b/symlinks/config/fish/fish_variables @@ -8,57 +8,11 @@ SETUVAR __fish_initialized:3400 SETUVAR __git_plugin_abbreviations:g\x1ega\x1egaa\x1egapa\x1egap\x1egb\x1egba\x1egban\x1egbd\x1egbD\x1egbl\x1egbs\x1egbsb\x1egbsg\x1egbsr\x1egbss\x1egc\x1egc\x21\x1egcn\x21\x1egca\x1egca\x21\x1egcan\x21\x1egcv\x1egcav\x1egcav\x21\x1egcm\x1egcam\x1egscam\x1egcfx\x1egcf\x1egcl\x1egclean\x1egclean\x21\x1egclean\x21\x21\x1egcount\x1egcp\x1egcpa\x1egcpc\x1egd\x1egdca\x1egds\x1egdsc\x1egdw\x1egdwc\x1egdto\x1egignore\x1egf\x1egfa\x1egfm\x1egfo\x1egl\x1egll\x1eglr\x1eglg\x1eglgg\x1eglgga\x1eglo\x1eglog\x1eglom\x1eglod\x1egloo\x1egm\x1egmt\x1egp\x1egp\x21\x1egpo\x1egpo\x21\x1egpv\x1egpv\x21\x1eggp\x21\x1egpu\x1egr\x1egra\x1egrb\x1egrba\x1egrbc\x1egrbi\x1egrbm\x1egrbmi\x1egrbmia\x1egrbd\x1egrbdi\x1egrbdia\x1egrbs\x1egrev\x1egrh\x1egrhh\x1egrhpa\x1egrm\x1egrmc\x1egrmv\x1egrrm\x1egrs\x1egrset\x1egrss\x1egrup\x1egrv\x1egsh\x1egsd\x1egsr\x1egss\x1egst\x1egsta\x1egstd\x1egstp\x1egsts\x1egsu\x1egsur\x1egsuri\x1egts\x1egtv\x1egsw\x1egswc\x1egunignore\x1egup\x1egwch\x1egco\x1egcb\x1egcod\x1egcom\x1egfb\x1egff\x1egfr\x1egfh\x1egfs\x1egfbs\x1egffs\x1egfrs\x1egfhs\x1egfss\x1egfbt\x1egfft\x1egfrt\x1egfht\x1egfst\x1egfp SETUVAR __git_plugin_initialized:Wed\x20Jun\x2030\x2009\x3a17\x3a14\x20CEST\x202021 SETUVAR _fish_abbr_batdiff:git\x20diff\x20\x2d\x2dname\x2donly\x20\x2d\x2ddiff\x2dfilter\x3dd\x20\x7c\x20xargs\x20bat\x20\x2d\x2ddiff -SETUVAR _fish_abbr_g:git -SETUVAR _fish_abbr_ga:git\x20add -SETUVAR _fish_abbr_gaa:git\x20add\x20\x2d\x2dall -SETUVAR _fish_abbr_gap:git\x20apply -SETUVAR _fish_abbr_gapa:git\x20add\x20\x2d\x2dpatch -SETUVAR _fish_abbr_gb:git\x20branch\x20\x2dvv -SETUVAR _fish_abbr_gbD:git\x20branch\x20\x2dD -SETUVAR _fish_abbr_gba:git\x20branch\x20\x2da\x20\x2dv -SETUVAR _fish_abbr_gban:git\x20branch\x20\x2da\x20\x2dv\x20\x2d\x2dno\x2dmerged -SETUVAR _fish_abbr_gbd:git\x20branch\x20\x2dd -SETUVAR _fish_abbr_gbl:git\x20blame\x20\x2db\x20\x2dw -SETUVAR _fish_abbr_gbs:git\x20bisect -SETUVAR _fish_abbr_gbsb:git\x20bisect\x20bad -SETUVAR _fish_abbr_gbsg:git\x20bisect\x20good -SETUVAR _fish_abbr_gbsr:git\x20bisect\x20reset -SETUVAR _fish_abbr_gbss:git\x20bisect\x20start -SETUVAR _fish_abbr_gc:git\x20commit\x20\x2dv -SETUVAR _fish_abbr_gc_21_:git\x20commit\x20\x2dv\x20\x2d\x2damend -SETUVAR _fish_abbr_gca:git\x20commit\x20\x2dv\x20\x2da -SETUVAR _fish_abbr_gca_21_:git\x20commit\x20\x2dv\x20\x2da\x20\x2d\x2damend -SETUVAR _fish_abbr_gcam:git\x20commit\x20\x2da\x20\x2dm -SETUVAR _fish_abbr_gcan_21_:git\x20commit\x20\x2dv\x20\x2da\x20\x2d\x2dno\x2dedit\x20\x2d\x2damend -SETUVAR _fish_abbr_gcav:git\x20commit\x20\x2da\x20\x2dv\x20\x2d\x2dno\x2dverify -SETUVAR _fish_abbr_gcav_21_:git\x20commit\x20\x2da\x20\x2dv\x20\x2d\x2dno\x2dverify\x20\x2d\x2damend SETUVAR _fish_abbr_gcb:git\x20checkout\x20\x2db SETUVAR _fish_abbr_gcd:git\x20checkout\x20develop -SETUVAR _fish_abbr_gcf:git\x20config\x20\x2d\x2dlist -SETUVAR _fish_abbr_gcfx:git\x20commit\x20\x2d\x2dfixup -SETUVAR _fish_abbr_gcl:git\x20clone -SETUVAR _fish_abbr_gclean:git\x20clean\x20\x2ddi -SETUVAR _fish_abbr_gclean_21_:git\x20clean\x20\x2ddfx -SETUVAR _fish_abbr_gclean_21_21_:git\x20reset\x20\x2d\x2dhard\x3b\x20and\x20git\x20clean\x20\x2ddfx -SETUVAR _fish_abbr_gcm:git\x20checkout\x20\x28__git\x2edefault_branch\x29 -SETUVAR _fish_abbr_gcn_21_:git\x20commit\x20\x2dv\x20\x2d\x2dno\x2dedit\x20\x2d\x2damend SETUVAR _fish_abbr_gco:git\x20checkout SETUVAR _fish_abbr_gcod:git\x20checkout\x20develop SETUVAR _fish_abbr_gcom:git\x20checkout\x20\x28__git\x2edefault_branch\x29 -SETUVAR _fish_abbr_gcount:git\x20shortlog\x20\x2dsn -SETUVAR _fish_abbr_gcp:git\x20cherry\x2dpick -SETUVAR _fish_abbr_gcpa:git\x20cherry\x2dpick\x20\x2d\x2dabort -SETUVAR _fish_abbr_gcpc:git\x20cherry\x2dpick\x20\x2d\x2dcontinue -SETUVAR _fish_abbr_gcv:git\x20commit\x20\x2dv\x20\x2d\x2dno\x2dverify -SETUVAR _fish_abbr_gd:git\x20diff -SETUVAR _fish_abbr_gdca:git\x20diff\x20\x2d\x2dcached -SETUVAR _fish_abbr_gds:git\x20diff\x20\x2d\x2dstat -SETUVAR _fish_abbr_gdsc:git\x20diff\x20\x2d\x2dstat\x20\x2d\x2dcached -SETUVAR _fish_abbr_gdto:git\x20difftool -SETUVAR _fish_abbr_gdw:git\x20diff\x20\x2d\x2dword\x2ddiff -SETUVAR _fish_abbr_gdwc:git\x20diff\x20\x2d\x2dword\x2ddiff\x20\x2d\x2dcached -SETUVAR _fish_abbr_gf:git\x20fetch -SETUVAR _fish_abbr_gfa:git\x20fetch\x20\x2d\x2dall\x20\x2d\x2dprune SETUVAR _fish_abbr_gfb:git\x20flow\x20bugfix SETUVAR _fish_abbr_gfbs:git\x20flow\x20bugfix\x20start SETUVAR _fish_abbr_gfbt:git\x20flow\x20bugfix\x20track @@ -68,8 +22,6 @@ SETUVAR _fish_abbr_gfft:git\x20flow\x20feature\x20track SETUVAR _fish_abbr_gfh:git\x20flow\x20hotfix SETUVAR _fish_abbr_gfhs:git\x20flow\x20hotfix\x20start SETUVAR _fish_abbr_gfht:git\x20flow\x20hotfix\x20track -SETUVAR _fish_abbr_gfm:git\x20fetch\x20origin\x20\x28__git\x2edefault_branch\x29\x20\x2d\x2dprune\x3b\x20and\x20git\x20merge\x20FETCH_HEAD -SETUVAR _fish_abbr_gfo:git\x20fetch\x20origin SETUVAR _fish_abbr_gfp:git\x20flow\x20publish SETUVAR _fish_abbr_gfr:git\x20flow\x20release SETUVAR _fish_abbr_gfrs:git\x20flow\x20release\x20start @@ -80,7 +32,6 @@ SETUVAR _fish_abbr_gfst:git\x20flow\x20support\x20track SETUVAR _fish_abbr_ggp_21_:ggp\x20\x2d\x2dforce\x2dwith\x2dlease SETUVAR _fish_abbr_ggpull:ggl SETUVAR _fish_abbr_ggpush:ggp -SETUVAR _fish_abbr_gignore:git\x20update\x2dindex\x20\x2d\x2dassume\x2dunchanged SETUVAR _fish_abbr_gitfzflog:git\x20log\x20\x2d\x2doneline\x20\x7c\x20fzf\x20\x2d\x2dmulti\x20\x2d\x2dpreview\x20\x22git\x20show\x20\x7b\x2b1\x7d\x22 SETUVAR _fish_abbr_gl:git\x20pull SETUVAR _fish_abbr_glg:git\x20log\x20\x2d\x2dstat\x20\x2d\x2dmax\x2dcount\x3d10 @@ -128,7 +79,6 @@ SETUVAR _fish_abbr_grset:git\x20remote\x20set\x2durl SETUVAR _fish_abbr_grss:git\x20restore\x20\x2d\x2dsource SETUVAR _fish_abbr_grup:git\x20remote\x20update SETUVAR _fish_abbr_grv:git\x20remote\x20\x2dv -SETUVAR _fish_abbr_gscam:git\x20commit\x20\x2dS\x20\x2da\x20\x2dm SETUVAR _fish_abbr_gsd:git\x20svn\x20dcommit SETUVAR _fish_abbr_gsh:git\x20show SETUVAR _fish_abbr_gsr:git\x20svn\x20rebase