jimeh/dotfiles
1
0
Fork 0
mirror of https://github.com/jimeh/dotfiles.git synced 2026-02-19 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(gitconfig): enable rerere

Browse Source
This commit is contained in:
Jim Myhrberg
2025-07-14 11:55:45 +01:00
parent 93e46d8edc
commit c5e6591d7f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gitconfig
View File

@@ -17,6 +17,10 @@
whitespace = nowarn whitespace = nowarn
[push] [push]
default = simple default = simple
[pull]
rebase = true
[rerere]
enabled = true
[alias] [alias]
a = add a = add
ai = add -i ai = add -i
@@ -40,8 +44,6 @@
pgp-on = config commit.gpgsign true pgp-on = config commit.gpgsign true
pgp-off = config commit.gpgsign false pgp-off = config commit.gpgsign false
tree = log --all --graph --decorate --oneline --simplify-by-decoration tree = log --all --graph --decorate --oneline --simplify-by-decoration
[pull]
rebase = true
[difftool "Kaleidoscope"] [difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool] [difftool]
@@ -72,10 +74,8 @@
[gitlab] [gitlab]
user = jimeh user = jimeh
[credential "https://github.com"] [credential "https://github.com"]
helper =
helper = !op plugin run -- gh auth git-credential helper = !op plugin run -- gh auth git-credential
[credential "https://gist.github.com"] [credential "https://gist.github.com"]
helper =
helper = !op plugin run -- gh auth git-credential helper = !op plugin run -- gh auth git-credential
[merge "mergiraf"] [merge "mergiraf"]
name = mergiraf name = mergiraf