From b6e6625a32835f5320aa278ba11519499864b4ab Mon Sep 17 00:00:00 2001 From: Viyurz <128215328+Viyurz@users.noreply.github.com> Date: Fri, 24 Nov 2023 08:17:57 +0100 Subject: [PATCH] Update Git config --- .config/git/config | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.config/git/config b/.config/git/config index 2ea1fcb..72e5b8d 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,7 +1,7 @@ [user] name = Viyurz email = 128215328+Viyurz@users.noreply.github.com - signingkey = /home/viyurz/.ssh/id_ed25519.pub + signingkey = ~/.ssh/id_ed25519.pub [init] defaultBranch = main [commit] @@ -20,10 +20,11 @@ d = diff l = log m = merge + ca = commit --amend --no-edit r = rebase s = status - [merge] ff = no - commit = no conflictstyle = diff3 +[core] + autocrlf = input