stuff
This commit is contained in:
parent
c5b629b295
commit
69165bbbf7
9 changed files with 213 additions and 94 deletions
|
@ -6,8 +6,8 @@
|
|||
excludesFile = ~/.config/git/ignore
|
||||
# Paginate output
|
||||
pager = less
|
||||
# Use Codium as default editor
|
||||
editor = codium --wait
|
||||
# Use Helix as default editor
|
||||
editor = hx
|
||||
# Don't consider trailing space change as a cause for merge conflicts
|
||||
whitespace = -trailing-space
|
||||
[init]
|
||||
|
@ -36,12 +36,12 @@
|
|||
wordRegex = .
|
||||
# Display submodule-related information (commit listings)
|
||||
submodule = log
|
||||
# Use VSCode as default diff tool when running `git difftool`
|
||||
tool = codium
|
||||
# Use Helix as default diff tool when running `git difftool` (TODO)
|
||||
# tool = helix
|
||||
[difftool]
|
||||
prompt = false
|
||||
[difftool "codium"]
|
||||
cmd = codium --wait --diff -- "$LOCAL" "$REMOTE"
|
||||
# [difftool "helix"]
|
||||
# cmd = hx --wait --diff -- "$LOCAL" "$REMOTE"
|
||||
[fetch]
|
||||
# Auto-fetch submodule changes (won't auto-update)
|
||||
recurseSubmodules = on-demand
|
||||
|
|
4
home/git/.config/git/config-work
Normal file
4
home/git/.config/git/config-work
Normal file
|
@ -0,0 +1,4 @@
|
|||
[user]
|
||||
name = Lukas Wurzinger
|
||||
email = lukas@wrz.one
|
||||
signingkey = ~/.ssh/id_ed25519.pub
|
Loading…
Add table
Add a link
Reference in a new issue