From adcc2d6b127d9ef2eb78a08f80a5cb64d9492477 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Mon, 18 May 2026 22:21:14 +0800 Subject: git: mergiraf --- dot-gitconfig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'dot-gitconfig') diff --git a/dot-gitconfig b/dot-gitconfig index 86c0d5aa..fa49189c 100644 --- a/dot-gitconfig +++ b/dot-gitconfig @@ -29,7 +29,14 @@ gpgSign = true [rebase] autosquash = true + updateRefs = true [core] - sshCommand = ssh -p 222 + sshCommand = ssh -p 2002 [merge] ff = false + conflictStyle = "diff3" +[lfs] + cachecredentials = true +[merge "mergiraf"] + name = mergiraf + driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L -- cgit v1.2.3