|
|
@@ -4,123 +4,124 @@
|
|
|
signingkey = E54F23DDA33256B4BC82B7184C73BAD25156DACE
|
|
|
|
|
|
[core]
|
|
|
- autocrlf = input
|
|
|
- excludesfile = ~/.config/git/.gitignore
|
|
|
- compression = 9
|
|
|
- whitespace = error
|
|
|
- preloadindex = true
|
|
|
+ autocrlf = input
|
|
|
+ excludesfile = ~/.config/git/.gitignore
|
|
|
+ compression = 9
|
|
|
+ whitespace = error
|
|
|
+ preloadindex = true
|
|
|
|
|
|
[include]
|
|
|
- path = ~/.config/git/gitalias.ini
|
|
|
+ path = ~/.config/git/gitalias.ini
|
|
|
|
|
|
[includeIf "gitdir:~/Sync/"]
|
|
|
- path = ~/Sync/Obsidian/.gitconfig
|
|
|
+ path = ~/Sync/Obsidian/.gitconfig
|
|
|
|
|
|
[advice]
|
|
|
- addEmptyPathspec = false
|
|
|
- pushNonFastForward = false
|
|
|
- statusHints = false
|
|
|
+ addEmptyPathspec = false
|
|
|
+ pushNonFastForward = false
|
|
|
+ statusHints = false
|
|
|
|
|
|
[status]
|
|
|
- branch = true
|
|
|
- showStash = true
|
|
|
- showUntrackedFiles = all
|
|
|
+ branch = true
|
|
|
+ showStash = true
|
|
|
+ showUntrackedFiles = all
|
|
|
|
|
|
[color]
|
|
|
- ui = true
|
|
|
+ ui = true
|
|
|
|
|
|
[color "diff-highlight"]
|
|
|
- oldNormal = red bold
|
|
|
- oldHighlight = red bold 52
|
|
|
- newNormal = green bold
|
|
|
- newHighlight = green bold 22
|
|
|
+ oldNormal = red bold
|
|
|
+ oldHighlight = red bold 52
|
|
|
+ newNormal = green bold
|
|
|
+ newHighlight = green bold 22
|
|
|
|
|
|
[color "diff"]
|
|
|
- meta = black bold
|
|
|
- frag = magenta
|
|
|
- context = white
|
|
|
- whitespace = yellow reverse
|
|
|
- old = red
|
|
|
+ meta = black bold
|
|
|
+ frag = magenta
|
|
|
+ context = white
|
|
|
+ whitespace = yellow reverse
|
|
|
+ old = red
|
|
|
|
|
|
[color "blame"]
|
|
|
- highlightRecent = 237, 20 month ago, 238, 19 month ago, 239, 18 month ago, 240, 17 month ago, 241, 16 month ago, 242, 15 month ago, 243, 14 month ago, 244, 13 month ago, 245, 12 month ago, 246, 11 month ago, 247, 10 month ago, 248, 9 month ago, 249, 8 month ago, 250, 7 month ago, 251, 6 month ago, 252, 5 month ago, 253, 4 month ago, 254, 3 month ago, 231, 2 month ago, 230, 1 month ago, 229, 3 weeks ago, 228, 2 weeks ago, 227, 1 week ago, 226
|
|
|
+ highlightRecent = 237, 20 month ago, 238, 19 month ago, 239, 18 month ago, 240, 17 month ago, 241, 16 month ago, 242, 15 month ago, 243, 14 month ago, 244, 13 month ago, 245, 12 month ago, 246, 11 month ago, 247, 10 month ago, 248, 9 month ago, 249, 8 month ago, 250, 7 month ago, 251, 6 month ago, 252, 5 month ago, 253, 4 month ago, 254, 3 month ago, 231, 2 month ago, 230, 1 month ago, 229, 3 weeks ago, 228, 2 weeks ago, 227, 1 week ago, 226
|
|
|
|
|
|
[color "decorate"]
|
|
|
- HEAD = red
|
|
|
- branch = blue
|
|
|
- tag = yellow
|
|
|
- remoteBranch = magenta
|
|
|
+ HEAD = red
|
|
|
+ branch = blue
|
|
|
+ tag = yellow
|
|
|
+ remoteBranch = magenta
|
|
|
|
|
|
[color "branch"]
|
|
|
- current = magenta
|
|
|
- local = default
|
|
|
- remote = yellow
|
|
|
- upstream = green
|
|
|
- plain = blue
|
|
|
+ current = magenta
|
|
|
+ local = default
|
|
|
+ remote = yellow
|
|
|
+ upstream = green
|
|
|
+ plain = blue
|
|
|
|
|
|
[interactive]
|
|
|
- ; diffFilter = diff-so-fancy --patch
|
|
|
- singlekey = true
|
|
|
+ ; diffFilter = diff-so-fancy --patch
|
|
|
+ singlekey = true
|
|
|
|
|
|
[credential]
|
|
|
- helper = /usr/lib/git-core/git-credential-libsecret
|
|
|
+ helper = /usr/lib/git-core/git-credential-libsecret
|
|
|
|
|
|
[merge]
|
|
|
- tool = fugitive
|
|
|
- conflictStyle = diff3
|
|
|
+ tool = fugitive
|
|
|
+ conflictStyle = diff3
|
|
|
|
|
|
[icdiff]
|
|
|
- options = --highlight --line-numbers
|
|
|
+ options = --highlight --line-numbers
|
|
|
|
|
|
[diff]
|
|
|
- context = 3
|
|
|
- renames = copies
|
|
|
- interHunkContext = 10
|
|
|
+ context = 3
|
|
|
+ renames = copies
|
|
|
+ interHunkContext = 10
|
|
|
|
|
|
; [pager]
|
|
|
-; pager = diff-so-fancy | less --tabs=4 -RF
|
|
|
+; pager = diff-so-fancy | less --tabs=4 -RF
|
|
|
|
|
|
[diff-so-fancy]
|
|
|
- markEmptyLines = false
|
|
|
+ markEmptyLines = false
|
|
|
|
|
|
[init]
|
|
|
- defaultBranch = master
|
|
|
+ defaultBranch = master
|
|
|
|
|
|
[pull]
|
|
|
- rebase = true
|
|
|
- default = current
|
|
|
+ rebase = true
|
|
|
+ default = current
|
|
|
|
|
|
[push]
|
|
|
- autoSetupRemote = true
|
|
|
- default = current
|
|
|
- followTags = true
|
|
|
+ autoSetupRemote = true
|
|
|
+ default = current
|
|
|
+ followTags = true
|
|
|
|
|
|
[rebase]
|
|
|
- autoStash = true
|
|
|
- missingCommitsCheck = warn
|
|
|
+ autoStash = true
|
|
|
+ missingCommitsCheck = warn
|
|
|
|
|
|
[commit]
|
|
|
- gpgsign = true
|
|
|
+ gpgsign = true
|
|
|
|
|
|
[log]
|
|
|
- abbrevCommit = true
|
|
|
- graphColors = blue,yellow,cyan,magenta,green,red
|
|
|
+ abbrevCommit = true
|
|
|
+ graphColors = blue,yellow,cyan,magenta,green,red
|
|
|
|
|
|
[url "https://github.com/RustSec/advisory-db"]
|
|
|
- insteadOf = https://github.com/RustSec/advisory-db
|
|
|
+ insteadOf = https://github.com/RustSec/advisory-db
|
|
|
|
|
|
[url "git@github.com:marianozunino/"]
|
|
|
- insteadOf = "mz:"
|
|
|
+ insteadOf = "mz:"
|
|
|
|
|
|
[url "git@github.com:Stuzo/"]
|
|
|
- insteadOf = "stuzo:"
|
|
|
+ insteadOf = "stuzo:"
|
|
|
|
|
|
[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
|
|
|
|
|
|
[alias]
|
|
|
- bb = !better-git-branch.sh
|
|
|
- to = !git branch --set-upstream-to=origin/$(git branch --show-current)
|
|
|
+ bb = !better-git-branch.sh
|
|
|
+ to = !git branch --set-upstream-to=origin/$(git branch --show-current)
|
|
|
+
|