86550d7668f74ee3cb0473147ff0945bbf861e62

Author
TheEdgeOfRage <git@theedgeofrage.com>
Committer
TheEdgeOfRage <git@theedgeofrage.com>
Date

Message

Add gfc alias for conflict resolution

Diff

 1diff --git a/dot_aliases.tmpl b/dot_aliases.tmpl
 2index f8a433e93f68981e4507f5db8ad46402960545ed..1d06dbfdd544e299ebc26761ff5e761745244f2d 100644
 3--- a/dot_aliases.tmpl
 4+++ b/dot_aliases.tmpl
 5@@ -83,6 +83,7 @@ alias wifi='nmcli radio wifi'
 6 alias gdp='g lg $(gtv T -n1)..main | grep -v "<Flux>"'
 7 alias gt='g tag'
 8 alias gum='gfa && g branch -f $(git_main_branch) origin/$(git_main_branch)'
 9+alias gfc="gss | grep '^UU\|^AA\|^DD\|^AU\|^UA\|^DU\|^UD' | cut -c4- | xargs vim"
10 
11 # Diable ghostscript binary. Useless on the shell and cannot be killed normally
12 alias gs=''