chore(git): sort config values
parent
4312ebee8c
commit
654a3707fd
|
@ -5,33 +5,44 @@
|
||||||
git = {
|
git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
user.private.name = "Michael Mandl";
|
|
||||||
user.private.email = "mandlm@molez.net";
|
|
||||||
user.private.signingkey = "4AA25D647AA54CC7";
|
|
||||||
|
|
||||||
user.swp.name = "Michael Mandl";
|
|
||||||
user.swp.email = "mandl@vi-bim.de";
|
|
||||||
user.swp.signingkey = "4E60F44227F611B4";
|
|
||||||
|
|
||||||
core.editor = "nvim";
|
core.editor = "nvim";
|
||||||
fetch.writeCommitGraph = true;
|
|
||||||
format.pretty = "format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s";
|
|
||||||
init.defaultBranch = "main";
|
|
||||||
log.date = "relative";
|
|
||||||
pull.rebase = true;
|
|
||||||
rebase.autostash = true;
|
|
||||||
rerere.enabled = true;
|
|
||||||
worktree.guessRemote = true;
|
|
||||||
|
|
||||||
diff.external = "difft --background light";
|
diff.external = "difft --background light";
|
||||||
diff.tool = "difftastic";
|
diff.tool = "difftastic";
|
||||||
difftool.prompt = false;
|
|
||||||
difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\"";
|
difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\"";
|
||||||
pager.difftool = true;
|
difftool.prompt = false;
|
||||||
|
|
||||||
|
fetch.writeCommitGraph = true;
|
||||||
|
|
||||||
|
format.pretty = "format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s";
|
||||||
|
|
||||||
|
init.defaultBranch = "main";
|
||||||
|
|
||||||
|
log.date = "relative";
|
||||||
|
|
||||||
merge.tool = "nvim";
|
merge.tool = "nvim";
|
||||||
mergetool.prompt = false;
|
|
||||||
mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";
|
mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";
|
||||||
|
mergetool.prompt = false;
|
||||||
|
|
||||||
|
pager.difftool = true;
|
||||||
|
|
||||||
|
pull.rebase = true;
|
||||||
|
|
||||||
|
rebase.autostash = true;
|
||||||
|
|
||||||
|
rerere.enabled = true;
|
||||||
|
|
||||||
|
user.private.email = "mandlm@molez.net";
|
||||||
|
user.private.name = "Michael Mandl";
|
||||||
|
user.private.signingkey = "4AA25D647AA54CC7";
|
||||||
|
|
||||||
|
user.swp.email = "mandl@vi-bim.de";
|
||||||
|
user.swp.name = "Michael Mandl";
|
||||||
|
user.swp.signingkey = "4E60F44227F611B4";
|
||||||
|
|
||||||
|
worktree.guessRemote = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases = {
|
aliases = {
|
||||||
|
|
Loading…
Reference in New Issue