diff --git a/dot_config/git/config.tmpl b/dot_config/git/config.tmpl new file mode 100644 index 0000000..e121594 --- /dev/null +++ b/dot_config/git/config.tmpl @@ -0,0 +1,67 @@ +[user] + name = inkch + email = inkch@posteo.jp + +[core] + excludesfile = ~/.config/git/ignore + editor = nvim + pager = delta + autocrlf = false + quotepath = false + +[commit] + template = ~/.config/git/commitmsg + +[init] + defaultBranch = main + +[color] + status = auto + branch = auto + ui = auto + +[delta] + line-numbers = true + diff-so-fancy = true + dark = true + navigate = true + syntax-theme = base16 + +[interactive] + diffFilter = delta -n --color-only --diff-so-fancy + +[diff] + renames = true + colorMoved = default + +[merge] + tool = nvimdiff + +[mergetool "nvimdiff"] + prompt = false + keepBackup = false + cmd = "nvim -d $LOCAL $MERGED $REMOTE" + +[status] + short = true + branch = true + +[log] + graph = true + decorate = true + oneline = true + all = true + +[alias] + s = status + fe = fetch + fa = fetch --all + co = checkout + cm = commit -m + cma = commit -am + emp = commit --allow-empty -m + br = branch + bra = branch -a + d = diff + l = log --graph --decorate --oneline --date=iso + delete-merged-branch = !git branch -l --merged main | rg -v \"(HEAD|main|\\*)\" | xargs -I % git branch -d % diff --git a/dot_config/git/empty_commitmsg b/dot_config/git/empty_commitmsg new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/git/ignore b/dot_config/git/ignore new file mode 100644 index 0000000..2ba4a59 --- /dev/null +++ b/dot_config/git/ignore @@ -0,0 +1,6 @@ +.nvmrc +.DS_Store +.vimroot +.note +tags +.#*