From 57ff5c0fb390646bed4269955d89c30227ba9a28 Mon Sep 17 00:00:00 2001 From: stanislas Date: Mon, 11 Nov 2024 09:11:08 +0100 Subject: [PATCH 1/4] Improved .vimrc --- .vimrc | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/.vimrc b/.vimrc index cd52193..86c3d79 100644 --- a/.vimrc +++ b/.vimrc @@ -1 +1,102 @@ +" 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. + +" }}} From ebc3f10d93e8f9a11fa343810a2a2d6058b4f515 Mon Sep 17 00:00:00 2001 From: stanislas Date: Mon, 11 Nov 2024 09:21:54 +0100 Subject: [PATCH 2/4] Updated .gitconfig --- .bashrc.swp | Bin 0 -> 20480 bytes .gitconfig | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 .bashrc.swp diff --git a/.bashrc.swp b/.bashrc.swp new file mode 100644 index 0000000000000000000000000000000000000000..76dce10481aff9a7303c45da391812a45bd0ec4b GIT binary patch literal 20480 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 literal 0 HcmV?d00001 diff --git a/.gitconfig b/.gitconfig index 8189d3a..8b8df49 100644 --- a/.gitconfig +++ b/.gitconfig @@ -7,29 +7,54 @@ [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 - lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset' + f = fetch + + 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 -[fetch] - prune = true - pruneTags = True + cp = cherry-pick + cpa = cherry-pick --abort + cpc = cherry-pick --continue + + s = stash + sp = stash pop + sa = stash apply + sd = stash drop all = true + [pull] rebase = true [push] From edd17a76284fe26ad16c352e0f155197b2194469 Mon Sep 17 00:00:00 2001 From: stanislas Date: Fri, 23 May 2025 07:51:19 +0000 Subject: [PATCH 3/4] added auto setup remote on push for old git versions --- .gitconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitconfig b/.gitconfig index 8b8df49..25178ba 100644 --- a/.gitconfig +++ b/.gitconfig @@ -58,7 +58,11 @@ [pull] rebase = true [push] + # for git >= 2.37 autoSetupRemote = true + # for git < 2.37 + default = current + followTags = true [commit] verbose = true From 9ac736317a405e88e23f50224cd1e7d4808da852 Mon Sep 17 00:00:00 2001 From: stanislas Date: Sun, 25 May 2025 21:21:01 +0200 Subject: [PATCH 4/4] removed unwanted swp file --- .bashrc.swp | Bin 20480 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .bashrc.swp diff --git a/.bashrc.swp b/.bashrc.swp deleted file mode 100644 index 76dce10481aff9a7303c45da391812a45bd0ec4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 zcmeI2dyFJS9mg9^Ufvxj7zLxInBBX5u(Pv!$6dHt2RV<$TeEjd*gFaAE@y8~%}#SY z-9tZicFyI%!;qL@LJW!j_=k~1<6j0rArZs`4L+jr6^X|9N=W!e<0;`U6+ge~o_*cP zBbXRtP4e08M^$yzw|@1j>aO47*vF=hr~{+p4!?Ie&e9i4OJCmp$OZLb$4OE*l*_O8 zlXT@q=k<~~rzK&6|f3e1*`&A0jq#j;D1Yjw7t!_k1AhSRGUu#=6AuC|8FbK zd++Kyx7^=WoL^G>Z*93>oZ5d@0jq#jz$#!BunJfOtO8a6tAJI&Dqt0`3j7xoaO;k< z>vG4r7i9mx_x}I=D;(!EL=eIUVH|eBRd6}%gtO#(2A+b4;L{*w-3hnAB)rPUg0t{D z_$_<^mf_=Y0^SQR>~Ng#z;kdPd>9VG%iA62Yw#dE0B7JJjKhWSkGDI{-{GsEVFca< zSHYhy<2uAphL^;0N#=d>fvH&%-DT!C5|H{29In&%)DM0QUx$a`Gw=}H4OhZD;ir6Dc?PbA_rQhlEFV-Jgj-+|cEJ^} z1GdBSe6TqK8a@g;;WxdHHiaE2exs_AC2=Kby0NZEv_;vATJ1omeiWMX6YJ-WQhr0t zsdD2@WKs(gDsAe}A?vj&X-4f-m7{x9J4*bO;#QwZqAd1wqAEJ|%wvnlkD*bgkL-Rj zB9Hddfke4MtlfH7>CjyabY1!3Ik}V@*7J+)IBNKTrjR_j;=)qwwpx-`tv5|Iw3}uz zH5lwhnW{(OK&nDb@o7|Kb)1He0wUSzJTT>i8~ARb6KR@JWy|%ort|n&tv8BRkMd@g zXS&D>#qM5PDDLpNZ=ANq(-F9O))k;)Tfqzn@J1EUmb=~ko-=rRO z9Mg0P(s5cF2&2?*bjyiG_HsFkmvrcLYeCdeWnY#02j^7(hg40CsRgxrx6)oSQmKwx ze&_~jbv3`B<2Z_kN|K!JPNTTHn!0|V%HjBGLO+zX8kip#NGf;DC&P1NOM#VEiHy)I?I=#wM-Cl2acE|G=C;||fT?_KYSH_bPzYQ8h?&M)+nx8$tI;22(wSC&&s_HZ#saBT9n zBPE6@b~4p4E>ZbXLuFDka2ehBj?_;XxQyj2(eX{qC`qd{+HtZ_QkX`bzz4SQ!kE0L zaqk#iajECwqy+tuE=>%$Wo**j4dFa?NT zL(-mcpkzbgCGoXrP8V>&ZHx{{#=)uCnab4Uq4NIg_Z%1+RfE&`aBBqvU=8rPV2s2K4^G_4!FBd$w?JoL(pLP)=i$h)CFviUo z%U$g1aCy(Z{if8RP2))Bdmu^iI)K2|s+R^2-pAVIB(tw5)M9c}jo4>2GHRrEMa7hXL>0uuWzE7uF=46ID`Ie* z8uS&b&O|K*(IP>{u_-rYK*~zUWHaOMl#U}sx#mf@O%_oR&&wx*BwO5YNtRalVT2kn z=F@glyf#B;c(^3K*QnvLf=ipB%b;b^;D!lHExI){b?*2&Q9GqS=%!Qyn4xaCgwqkBr2t88 zYPGR6F$-D9njTndrIg^d+jJpC=Lh0hrJ23Lr8`FQ6?n1Iy7l0(!#zhX$F)-b;h7_o zl~GnvZXi}u%`ccENl|hrv3TW}n`0=Li>h{-!+)QZ;juuqj^k)l($=2e@I4m)%YGb% z;!!p@1f_0v?A?fuuVF_GcBa3RnfK z0#*U5fK|XMU=^?mSOu&CRspNPn^R!JXOLRybmiu#69$o6Pb%%eP5BPiDyLBtB-Q*Y zNAbaMZL@N1OLg;3t`73=#O&qv_FOk4So;%Ry;ho8YCa5o%-S-2d2$iDtl@FXO#ANIjZ?CXCCPC*BjVIS;*SJ=}( z3x9z};SNx6DO>`7U|;`HXu!4b68rkUgdf4T;7ND_9*2ja1n-9z+1Ho7|EJ-b@E|Nh z6Z+tNa1C4uJ7EX>f{!7O!R>GZyc_RPLn0|S4=JbD^T0Yg;msoEwZb)Q%!BNF+L#9$^I&5h%;vR?d9X1L1VQ`#mu9j$CZs!rq5*1U=+JR57ki@Wt5=TOy ct2r={0}|F@BFGX#26$v1wpGMpj5^N00Beu5D*ylh