home
/
code
/
khome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Manage xlaunch scripts as a tmux session, a la pista
[khome.git]
/
home
/
.gitconfig
diff --git
a/home/.gitconfig
b/home/.gitconfig
index
fcd0539
..
c8e41e2
100644
(file)
--- a/
home/.gitconfig
+++ b/
home/.gitconfig
@@
-9,7
+9,7
@@
[cola]
spellcheck = false
[init]
[cola]
spellcheck = false
[init]
- defaultBranch =
master
+ defaultBranch =
dominus # as in "dominus ramus"
#[filter "lfs"]
# required = true
# clean = git-lfs clean -- %f
#[filter "lfs"]
# required = true
# clean = git-lfs clean -- %f
@@
-20,3
+20,8
@@
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
+[merge]
+ tool = vimdiff
+ conflictstyle = diff3
+[mergetool]
+ prompt = false
This page took
0.03499 seconds
and
4
git commands to generate.