kayprish/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

💄 style(git): 2 spaces for identation

Browse source
This commit is contained in:
Sergio Laín 2023-12-25 19:48:06 +01:00
parent ee9a55b52d
commit 8a95649ef2
No known key found for this signature in database
GPG key ID: 14C9B8080681777B
2 changed files with 225 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
.config/git/config
View file

@ -2,56 +2,72 @@
name = Sergio Laín name = Sergio Laín
email = sergiolain11@gmail.com email = sergiolain11@gmail.com
signingKey = 14C9B8080681777B signingKey = 14C9B8080681777B
[safe] [safe]
directory = ~/Repos/ directory = ~/Repos/
[credential "https://github.com"] [credential "https://github.com"]
username = Matt-FTW username = Matt-FTW
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[init] [init]
defaultBranch = main defaultBranch = main
[protocol "file"] [protocol "file"]
allow = always allow = always
[credential] [credential]
helper = libsecret helper = libsecret
[core] [core]
editor = nvim editor = nvim
pager = diff-so-fancy | less --tabs=4 -RFX pager = diff-so-fancy | less --tabs=4 -RFX
excludesfile = ~/.config/git/ignore excludesfile = ~/.config/git/ignore
[interactive] [interactive]
diffFilter = diff-so-fancy --patch diffFilter = diff-so-fancy --patch
[merge] [merge]
tool = nvimdiff tool = nvimdiff
conflictstyle = diff3 conflictstyle = diff3
[pager] [pager]
blame = diff-so-fancy | less --tabs=4 -RFX blame = diff-so-fancy | less --tabs=4 -RFX
[diff] [diff]
colorMoved = default colorMoved = default
[pull] [pull]
rebase = false rebase = false
[commit] [commit]
gpgsign = true gpgsign = true
[gpg] [gpg]
program = /sbin/gpg program = /sbin/gpg
[includeIf "gitdir:~/Repos/Work/"] [includeIf "gitdir:~/Repos/Work/"]
path = ~/.config/git/config-work path = ~/.config/git/config-work
[alias] [alias]
aliases = config --get-regexp alias aliases = config --get-regexp alias
#############
a = add --all a = add --all
ai = add -i ai = add -i
#############
ap = apply ap = apply
as = apply --stat as = apply --stat
ac = apply --check ac = apply --check
#############
ama = am --abort ama = am --abort
amr = am --resolved amr = am --resolved
ams = am --skip ams = am --skip
#############
b = branch b = branch
ba = branch -a ba = branch -a
bd = branch -d bd = branch -d
@ -60,7 +76,7 @@
bc = rev-parse --abbrev-ref HEAD bc = rev-parse --abbrev-ref HEAD
bu = !git rev-parse --abbrev-ref --symbolic-full-name "@{u}" bu = !git rev-parse --abbrev-ref --symbolic-full-name "@{u}"
bs = !git-branch-status bs = !git-branch-status
#############
c = commit c = commit
ca = commit -a ca = commit -a
cm = commit -m cm = commit -m
@ -69,17 +85,17 @@
cd = commit --amend cd = commit --amend
cad = commit -a --amend cad = commit -a --amend
ced = commit --allow-empty --amend ced = commit --allow-empty --amend
#############
cl = clone cl = clone
cld = clone --depth 1 cld = clone --depth 1
clg = !sh -c 'git clone https://github.com/$1 $(basename $1)' - clg = !sh -c 'git clone https://github.com/$1 $(basename $1)' -
clgp = !sh -c 'git clone git@github.com:$1 $(basename $1)' - clgp = !sh -c 'git clone git@github.com:$1 $(basename $1)' -
clgu = !sh -c 'git clone git@github.com:$(git config --get user.username)/$1 $1' - clgu = !sh -c 'git clone git@github.com:$(git config --get user.username)/$1 $1' -
#############
cp = cherry-pick cp = cherry-pick
cpa = cherry-pick --abort cpa = cherry-pick --abort
cpc = cherry-pick --continue cpc = cherry-pick --continue
#############
d = diff d = diff
dp = diff --patience dp = diff --patience
dc = diff --cached dc = diff --cached
@ -87,46 +103,46 @@
dck = diff --cached --check dck = diff --cached --check
dt = difftool dt = difftool
dct = difftool --cached dct = difftool --cached
#############
f = fetch f = fetch
fo = fetch origin fo = fetch origin
fu = fetch upstream fu = fetch upstream
#############
fp = format-patch fp = format-patch
#############
fk = fsck fk = fsck
#############
g = grep -p g = grep -p
#############
l = log --oneline --graph --decorate l = log --oneline --graph --decorate
lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
#############
ls = ls-files ls = ls-files
lsf = !git ls-files | grep -i lsf = !git ls-files | grep -i
#############
m = merge m = merge
mm = merge --no-ff -m "🔀 merge: Merge branch '$(git symbolic-ref --short HEAD)' into '$(git branch --show-current)'" mm = merge --no-ff -m "🔀 merge: Merge branch '$(git symbolic-ref --short HEAD)' into '$(git branch --show-current)'"
ma = merge --abort ma = merge --abort
mc = merge --continue mc = merge --continue
ms = merge --skip ms = merge --skip
#############
o = checkout o = checkout
om = checkout master om = checkout master
ob = checkout -b ob = checkout -b
opr = !sh -c 'git fo pull/$1/head:pr-$1 && git o pr-$1' opr = !sh -c 'git fo pull/$1/head:pr-$1 && git o pr-$1'
#############
pr = prune -v pr = prune -v
#############
ps = push ps = push
psf = push -f psf = push -f
psu = push -u psu = push -u
pst = push --tags pst = push --tags
#############
pso = push origin pso = push origin
psao = push --all origin psao = push --all origin
psfo = push -f origin psfo = push -f origin
psuo = push -u origin psuo = push -u origin
#############
psom = push origin master psom = push origin master
psaom = push --all origin master psaom = push --all origin master
psfom = push -f origin master psfom = push -f origin master
@ -136,29 +152,29 @@
psfoc = !git push -f origin $(git bc) psfoc = !git push -f origin $(git bc)
psuoc = !git push -u origin $(git bc) psuoc = !git push -u origin $(git bc)
psdc = !git push origin :$(git bc) psdc = !git push origin :$(git bc)
#############
pl = pull pl = pull
pb = pull --rebase pb = pull --rebase
#############
plo = pull origin plo = pull origin
pbo = pull --rebase origin pbo = pull --rebase origin
plom = pull origin master plom = pull origin master
ploc = !git pull origin $(git bc) ploc = !git pull origin $(git bc)
pbom = pull --rebase origin master pbom = pull --rebase origin master
pboc = !git pull --rebase origin $(git bc) pboc = !git pull --rebase origin $(git bc)
#############
plu = pull upstream plu = pull upstream
plum = pull upstream master plum = pull upstream master
pluc = !git pull upstream $(git bc) pluc = !git pull upstream $(git bc)
pbum = pull --rebase upstream master pbum = pull --rebase upstream master
pbuc = !git pull --rebase upstream $(git bc) pbuc = !git pull --rebase upstream $(git bc)
#############
rb = rebase rb = rebase
rba = rebase --abort rba = rebase --abort
rbc = rebase --continue rbc = rebase --continue
rbi = rebase --interactive rbi = rebase --interactive
rbs = rebase --skip rbs = rebase --skip
#############
re = reset re = reset
rh = reset HEAD rh = reset HEAD
reh = reset --hard reh = reset --hard
@ -168,7 +184,7 @@
remh = reset --mixed HEAD remh = reset --mixed HEAD
resh = reset --soft HEAD resh = reset --soft HEAD
rehom = reset --hard origin/master rehom = reset --hard origin/master
#############
r = remote r = remote
ra = remote add ra = remote add
rr = remote rm rr = remote rm
@ -184,13 +200,13 @@
rsu = remote show upstream rsu = remote show upstream
rpo = remote prune origin rpo = remote prune origin
rpu = remote prune upstream rpu = remote prune upstream
#############
rmf = rm -f rmf = rm -f
rmrf = rm -r -f rmrf = rm -r -f
#############
s = status s = status
sb = status -s -b sb = status -s -b
#############
sa = stash apply sa = stash apply
sc = stash clear sc = stash clear
sd = stash drop sd = stash drop
@ -200,29 +216,29 @@
ssk = stash save -k ssk = stash save -k
sw = stash show sw = stash show
st = !git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*' st = !git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*'
#############
t = tag t = tag
td = tag -d td = tag -d
#############
w = show w = show
wp = show -p wp = show -p
wr = show -p --no-color wr = show -p --no-color
#############
svnr = svn rebase svnr = svn rebase
svnd = svn dcommit svnd = svn dcommit
svnl = svn log --oneline --show-commit svnl = svn log --oneline --show-commit
#############
subadd = !sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' - subadd = !sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' -
subrm = !sh -c 'git submodule deinit -f -- $1 && rm -rf .git/modules/$1 && git rm -f $1' - subrm = !sh -c 'git submodule deinit -f -- $1 && rm -rf .git/modules/$1 && git rm -f $1' -
subup = submodule update --init --recursive subup = submodule update --init --recursive
subpull = submodule foreach 'git pull --tags -f origin master || git pull --tags -f origin main' subpull = submodule foreach 'git pull --tags -f origin master || git pull --tags -f origin main'
#############
assume = update-index --assume-unchanged assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged unassume = update-index --no-assume-unchanged
assumed = !git ls -v | grep ^h | cut -c 3- assumed = !git ls -v | grep ^h | cut -c 3-
unassumeall = !git assumed | xargs git unassume unassumeall = !git assumed | xargs git unassume
assumeall = !git status -s | awk {'print $2'} | xargs git assume assumeall = !git status -s | awk {'print $2'} | xargs git assume
#############
bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' - bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' -
release = !sh -c 'git tag v$1 && git pst' - release = !sh -c 'git tag v$1 && git pst' -
unrelease = !sh -c 'git tag -d v$1 && git pso :v$1' - unrelease = !sh -c 'git tag -d v$1 && git pso :v$1' -
@ -232,10 +248,10 @@
bare = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' - bare = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
whois = !sh -c 'git log -i -1 --author=\"$1\" --pretty=\"format:%an <%ae>\"' - whois = !sh -c 'git log -i -1 --author=\"$1\" --pretty=\"format:%an <%ae>\"' -
serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
#############
behind = !git rev-list --left-only --count $(git bu)...HEAD behind = !git rev-list --left-only --count $(git bu)...HEAD
ahead = !git rev-list --right-only --count $(git bu)...HEAD ahead = !git rev-list --right-only --count $(git bu)...HEAD
#############
ours = "!f() { git checkout --ours $@ && git add $@; }; f" ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' - subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' -