Compare commits

...

3 Commits

Author SHA1 Message Date
25831458aa chore: fix git configs
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-08-28 11:22:22 +03:00
github-actions[bot]
41315f7c53 chore: update pre-commit hooks (#181) 2025-08-28 08:17:01 +03:00
renovate[bot]
fecbb3568c chore(deps): update ivuorinen/actions action (25.8.21 → 25.8.25) (#180)
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-08-28 02:00:55 +00:00
8 changed files with 61 additions and 56 deletions

View File

@@ -35,4 +35,4 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Run PR Lint
uses: ivuorinen/actions/pr-lint@05e171c506876dce80fc8eb00f6c0e628e2586b5 # 25.8.21
uses: ivuorinen/actions/pr-lint@8e88bf4cdb14c38c929ad2a89687d6eb635a3967 # 25.8.25

View File

@@ -29,4 +29,4 @@ jobs:
issues: write
steps:
- uses: ivuorinen/actions/sync-labels@05e171c506876dce80fc8eb00f6c0e628e2586b5 # 25.8.21
- uses: ivuorinen/actions/sync-labels@8e88bf4cdb14c38c929ad2a89687d6eb635a3967 # 25.8.25

View File

@@ -50,7 +50,7 @@ repos:
- id: actionlint
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 41.82.10
rev: 41.87.4
hooks:
- id: renovate-config-validator

View File

@@ -1,18 +1,19 @@
# vim: ft=gitconfig ai noexpandtab
[include]
path = ~/.dotfiles/config/git/shared
path = ~/.dotfiles/config/git/shared
[user]
name = Ismo Vuorinen
email = ismo@ivuorinen.net
name = Ismo Vuorinen
email = ismo@ivuorinen.net
[github]
user = ivuorinen
user = ivuorinen
[include]
path = ~/.config/git/overrides/config
path = ~/.config/git/overrides/config
[advice]
detachedHead = false
detachedHead = false
[column]
ui = auto
[branch]

View File

@@ -1,53 +1,54 @@
# vim: ft=gitconfig ai noexpandtab
[credential]
helper = store --file ~/.cache/git/git-credentials
helper = cache --timeout 30000
helper = store --file ~/.cache/git/git-credentials
helper = cache --timeout 30000
[core]
excludesfile = ~/.config/git/ignore
excludesfile = ~/.config/git/ignore
[init]
defaultBranch = main
defaultBranch = main
[pull]
rebase = true
rebase = true
[alias]
branchbydate = for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)'
branchcolor = "!for ref in $(git for-each-ref --sort=-committerdate --format=\"%(refname)\" refs/heads/ refs/remotes ); do git log -n1 $ref --pretty=format:\"%Cgreen%cr%Creset %C(yellow)%d%Creset %C(bold blue)<%an>%Creset%n\" | cat ; done | awk '! a[$0]++'"
llog = log --pretty=fuller
logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
nah = !git reset --hard && git clean -df
recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
undo = reset --soft HEAD^
undo-commit = reset HEAD~ --soft
branchbydate = for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)'
branchcolor = "!for ref in $(git for-each-ref --sort=-committerdate --format=\"%(refname)\" refs/heads/ refs/remotes ); do git log -n1 $ref --pretty=format:\"%Cgreen%cr%Creset %C(yellow)%d%Creset %C(bold blue)<%an>%Creset%n\" | cat ; done | awk '! a[$0]++'"
llog = log --pretty=fuller
logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
nah = !git reset --hard && git clean -df
recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
undo = reset --soft HEAD^
undo-commit = reset HEAD~ --soft
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[color]
ui = true
diff = auto
branch = auto
status = auto
ui = true
diff = auto
branch = auto
status = auto
[color "status"]
added = green bold
changed = yellow
deleted = red bold strike
untracked = cyan
branch = yellow black bold ul
added = green bold
changed = yellow
deleted = red bold strike
untracked = cyan
branch = yellow black bold ul
[submodule]
recurse = true
recurse = true
# dotfiles special config
[includeIf "hasconfig:remote.*.url:https://github.com/ivuorinen/dotfiles.git"]
path = ~/.dotfiles/config/git/special/dotfiles ;
path = ~/.dotfiles/config/git/special/dotfiles ;

View File

@@ -1,2 +1,3 @@
# vim: ft=gitconfig ai noexpandtab
[submodule]
recurse = false
recurse = false

View File

@@ -1,2 +1,4 @@
# vim: ft=gitconfig ai noexpandtab
Host tfs.ia.corp.svea.com
IdentityFile ~/.ssh/id_rsa
IdentityFile ~/.ssh/id_rsa

View File

@@ -1,26 +1,26 @@
# vim: ft=gitconfig sw=2 ts=2 et
# vim: ft=gitconfig ai noexpandtab
[include]
path = ~/.dotfiles/config/git/shared
path = ~/.dotfiles/config/git/shared
[gpg]
format = ssh
format = ssh
[user]
name = Ismo Vuorinen
email = ismo.vuorinen@svea.com
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMmEaS/pitd8TzLNaXf0ojTydEyFp2TWoDctuqTEF8Aw
name = Ismo Vuorinen
email = ismo.vuorinen@svea.com
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMmEaS/pitd8TzLNaXf0ojTydEyFp2TWoDctuqTEF8Aw
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
allowedSignersFile = ~/.ssh/allowed_signers
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
allowedSignersFile = ~/.ssh/allowed_signers
[commit]
gpgsign = true
gpgsign = true
[credential "https://github.com"]
helper =
helper = !/opt/homebrew/bin/gh auth git-credential
helper =
helper = !/opt/homebrew/bin/gh auth git-credential
[credential "https://gist.github.com"]
helper =
helper = !/opt/homebrew/bin/gh auth git-credential
helper =
helper = !/opt/homebrew/bin/gh auth git-credential