diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-02-04 22:43:04 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-02-04 22:43:04 +0900 |
| commit | e0eb49ed60b7b92d98a99e44852a3d5ab1baad41 (patch) | |
| tree | 1bd78defc6be38c561039ff66c1a4be744f0c919 | |
| parent | a49ad59f8b9b2dc91b17d5f08e1b466f9f645532 (diff) | |
| download | dotfiles-e0eb49ed60b7b92d98a99e44852a3d5ab1baad41.tar.gz dotfiles-e0eb49ed60b7b92d98a99e44852a3d5ab1baad41.tar.zst dotfiles-e0eb49ed60b7b92d98a99e44852a3d5ab1baad41.zip | |
git: disable advice.mergeconflict
| -rw-r--r-- | .config/git/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config index 824bd51..4763b50 100644 --- a/.config/git/config +++ b/.config/git/config @@ -6,6 +6,7 @@ [advice] detachedhead = false + mergeconflict = false skippedcherrypicks = false [help] |