From 1912f0d717d31dad492b825093ba9b2120339ad7 Mon Sep 17 00:00:00 2001 From: Mosder Date: Mon, 13 Jul 2026 15:23:55 +0200 Subject: added merge option for pulling in git and added intent for case labels in .clang-format --- common/home/mosder/.clang-format | 1 + common/home/mosder/.gitconfig | 2 ++ 2 files changed, 3 insertions(+) diff --git a/common/home/mosder/.clang-format b/common/home/mosder/.clang-format index 22282fe..147de9e 100644 --- a/common/home/mosder/.clang-format +++ b/common/home/mosder/.clang-format @@ -2,6 +2,7 @@ IndentWidth: 4 ContinuationIndentWidth: 4 UseTab: Never +IndentCaseLabels: true # Pointer alignment PointerAlignment: Right diff --git a/common/home/mosder/.gitconfig b/common/home/mosder/.gitconfig index 045dd9a..3c87f19 100644 --- a/common/home/mosder/.gitconfig +++ b/common/home/mosder/.gitconfig @@ -1,3 +1,5 @@ [user] email = xmosder12@gmail.com name = Mosder +[pull] + rebase = false -- cgit v1.2.3