.gitconfig

@@ -7,62 +7,33 @@
 
 [alias]
 	cg = config --global
-
+	aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'
+	ci = commit
 	co = checkout
 	st = status
-	f = fetch
+	lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset'
-
-	m = merge
-	ma = merge --abort
-	mc = merge --continue
-
-	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset' --abbrev-commit --decorate=full
-	aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'
-
 	oops = commit --amend --no-edit
-
-	p = push
 	pfl = push --force-with-lease
-
+	adda = add --a
-	rh = git reset --hard HEAD~1
-	rs = git reset --soft HEAD~1
 	uncommit = reset --soft HEAD~1
 	untrack = rm --cache --
-	unstage = reset --
-
 	rb = rebase
 	rbc = rebase --continue
 	rba = rebase --abort
 	rbi = rebase --interactive origin/main
-
-	adda = add --a
-	ci = commit
 	cim = commit -m
 	cima = commit -a -m
-
 	br = branch
 	bra = branch -a
-	brd = branch -d
-	brdd = branch -D
 
-	cp = cherry-pick
+[fetch]
-	cpa = cherry-pick --abort
+  prune = true
-	cpc = cherry-pick --continue
+  pruneTags = True
-
-	s = stash
-	sp = stash pop
-	sa = stash apply
-	sd = stash drop
   all = true
-
 [pull]
 	rebase = true
 [push]
-  # for git >= 2.37
   autoSetupRemote = true
-  # for git < 2.37
-  default = current
-  
   followTags = true
 [commit]
   verbose = true

.vimrc

@@ -1,102 +1 @@
-" Disable compatibility with vi which can cause unexpected issues
 set nocompatible
-
-" Enable type file detection. Vim will be able to try to detect the type of file in use
-filetype on
-" Enable plugins and load plugin for the detected file type
-filetype plugin on
-" Load an indent file for the detected file type
-filetype indent on
-" Turn syntax highlighting on
-syntax on
-" Auto indent
-set ai
-" Smart indent
-set si
-
-
-" Add numbers to each line on the left-hand side.
-set number
-" Highlight cursor line underneath the cursor horizontally
-set cursorline
-" Highlight cursor line underneath the cursor vertically
-" set cursorcolumn
-
-
-" Set shift width to 4 spaces
-set shiftwidth=2
-" Set tab width to 2 columns
-set tabstop=2
-" Use space characters instead of tabs
-set expandtab
-
-
-" While searching though a file incrementally highlight matching characters as you type
-set incsearch
-" Show the mode you are on the last line
-set showmode
-" Show matching words during a search
-set showmatch
-" Use highlighting when doing a search
-set hlsearch
-" Ignore case when searching
-set ignorecase
-" When searching try to be smart about cases
-set smartcase
-
-" For regular expressions turn magic on
-set magic
-
-" Set 7 lines to the cursor - when moving vertically using j/k
-set so=7
-
-" Use highlighting when doing a search
-set hlsearch
-" Make wildmenu behave like similar to Bash completion
-set wildmode=list:longest
-" There are certain files that we would never want to edit with Vim.
-" Wildmenu will ignore files with these extensions.
-set wildignore=*.docx,*.jpg,*.png,*.gif,*.pdf,*.pyc,*.exe,*.flv,*.img,*.xlsx,*/.git/*
-
-" Configure backspace so it acts as it should act
-set backspace=eol,start,indent
-set whichwrap+=<,>,h,l
-
-" Sets how many lines of history VIM has to remember
-set history=500
-
-
-
-" PLUGINS ---------------------------------------------------------------- {{{
-
-" Plugin code goes here.
-
-" }}}
-
-
-" MAPPINGS --------------------------------------------------------------- {{{
-
-" Mappings code goes here.
-
-" }}}
-
-
-" VIMSCRIPT -------------------------------------------------------------- {{{
-
-" This will enable code folding.
-" Use the marker method of folding.
-augroup filetype_vim
-    autocmd!
-    autocmd FileType vim setlocal foldmethod=marker
-augroup END
-
-" More Vimscripts code goes here.
-
-" }}}
-
-
-" STATUS LINE ------------------------------------------------------------ {{{
-
-" Status bar code goes here.
-
-" }}}