VectorKappa/dotfiles
1
0
Fork 0
mirror of https://github.com/VectorKappa/dotfiles.git synced 2025-12-19 16:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor editorconfig changes + new gpg key

Browse Source
This commit is contained in:
VectorKappa
2024-04-22 15:27:31 +02:00
parent 4818228ebd
commit 2e9e6dc76f
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/.editorconfig
View File

@@ -6,3 +6,26 @@ indent_style = tab
end_of_line = lf end_of_line = lf
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,py}]
charset = utf-8
[*.{c,h}pp]
indent_style = space
indent_size = 2
# 4 space indentation
[*.py]
indent_style = space
indent_size = 4
# Tab indentation (no size specified)
[Makefile]
indent_style = tab
# Matches the exact files either package.json or .travis.yml
[{package.json,.travis.yml}]
indent_style = space
indent_size = 2

8
common/.gitconfig
View File

@@ -155,7 +155,7 @@
#OTHER #OTHER
#Finds a filename in the git repository. Gives absolute location (from the git root). #Finds a filename in the git repository. Gives absolute location (from the git root).
find = !sh -c 'git ls-tree -r --name-only HEAD | grep --color $1' - find = !sh -c 'git ls-tree -r --name-only HEAD | grep --color $1' -
#Deletes all branches that were safely merged into the master. All other are skipped (no worries). #Deletes all branches that were safely merged into the master. All other are skipped (no worries).
#on osx xargs does not have -r argument, so it fail. If you remove -r, it will run at least once, making this not safe operation #on osx xargs does not have -r argument, so it fail. If you remove -r, it will run at least once, making this not safe operation
@@ -225,7 +225,7 @@
sprzatajwszystkokurwa = !sh -c 'git clean -x' && git reset --hard sprzatajwszystkokurwa = !sh -c 'git clean -x' && git reset --hard
wyjebzrobionekurwa = !sh -c 'git branch --merged' | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d wyjebzrobionekurwa = !sh -c 'git branch --merged' | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d
majonez = !sh -c 'branch="$(git rev-parse --abbrev-ref HEAD)" && git checkout master && git pull && git branch -d "$branch"' majonez = !sh -c 'branch="$(git rev-parse --abbrev-ref HEAD)" && git checkout master && git pull && git branch -d "$branch"'
dodajkurwa = add dodajkurwa = add
takkurwa = commit takkurwa = commit
sciagajkurwa = pull sciagajkurwa = pull
@@ -236,7 +236,7 @@
pchajkurwayolo = push --force pchajkurwayolo = push --force
sorrykurwa = commit --amend -m sorrykurwa = commit --amend -m
spierdolwszystko = merge spierdolwszystko = merge
cofnijwchuj = reset HEAD~100 cofnijwchuj = reset HEAD~100
wypierdolwchuj = reset HEAD~100 --hard wypierdolwchuj = reset HEAD~100 --hard
acomitamkurwa = push origin --force acomitamkurwa = push origin --force
@@ -250,7 +250,7 @@
[user] [user]
name = VectorKappa name = VectorKappa
email = piotrpatalong@gmail.com email = piotrpatalong@gmail.com
signingkey = 0917E6568B3A9A02 signingkey = 32DCE8467E7FBD4F
[mergetool] [mergetool]
keepBackup = true keepBackup = true
[init] [init]