From 3597e89c378d23e6243c7cc4b969ee2aa89fadfd Mon Sep 17 00:00:00 2001 From: Russell Riker Date: Wed, 12 Oct 2022 18:08:07 +0000 Subject: [PATCH 1/2] Think I've fixed/rebased my files --- .bash_aliases | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index 2413b07..7a6d936 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -11,7 +11,10 @@ if [ $HOSTNAME != 'tilde' ] then alias ls='lsd' + # bat, cat with wings + alias cat='batcat' fi + alias ll='ls -alF' alias la='ls -a' # alias l='ls -CF' @@ -38,8 +41,8 @@ alias gb='git branch' # vi and nvim aliases -alias vim='nvim' -alias vi='nvim' +#alias vim='nvim' +#alias vi='nvim' alias ni='nvim' # bat, cat with wings @@ -47,6 +50,8 @@ alias ni='nvim' [ -f /usr/bin/bat ] && alias cat='bat' [ -f /usr/bin/batcat] && alias cat='batcat' + + # apt aliass alias aptud='sudo apt update' alias aptudls='sudo apt list --upgradeable' From 63d52ed0573091d7afbac0bb8a93bb8da029eff6 Mon Sep 17 00:00:00 2001 From: Russell Riker Date: Wed, 12 Oct 2022 14:41:24 -0400 Subject: [PATCH 2/2] added pull.rebase config --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index 2d16a87..f15ab69 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,3 +4,5 @@ signingkey = B30FB26E1B0663C6 [core] editor = vim +[pull] + rebase = false