From a2ad4533333247ed76654211d52c2aef1b9ab423 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 24 May 2024 23:48:49 -0400 Subject: git: Move to ~/.config/ --- git/.config/git/config | 36 ++++++++++++++++++++++++++++++++++++ git/.config/git/ignore | 2 ++ git/.gitconfig | 37 ------------------------------------- git/.global_ignore | 2 -- 4 files changed, 38 insertions(+), 39 deletions(-) create mode 100644 git/.config/git/config create mode 100644 git/.config/git/ignore delete mode 100644 git/.gitconfig delete mode 100644 git/.global_ignore diff --git a/git/.config/git/config b/git/.config/git/config new file mode 100644 index 0000000..dba3510 --- /dev/null +++ b/git/.config/git/config @@ -0,0 +1,36 @@ +[user] + email = mattst88@gmail.com + name = Matt Turner + signingkey = 0xACEB29740C9A4E97! +[includeIf "gitdir:~/projects/gentoo/"] + path = ~/projects/gentoo/.gitconfig +[color] + ui = auto +[rebase] + autosquash = true +[core] + autocrlf = false + filemode = false + pager = less -+F +[diff] + renames = true +[push] + default = simple +[alias] + fixes = show -s --pretty='format:Fixes: %h (\"%s\")' + co = checkout + br = branch + shwo = show + grpe = grep + lgo = log + last-commit-to = log -n 1 --pretty=format:%H +[init] + defaultBranch = main +[fixup] + menu = fzf --height '60%' \ + --bind 'tab:toggle-preview' \ + --bind 'space:preview-page-down' \ + --preview 'git show --color {+1}' \ + --preview-window=up:80% \ + --preview-window cycle \ + --prompt 'Select commit: ' diff --git a/git/.config/git/ignore b/git/.config/git/ignore new file mode 100644 index 0000000..25b4c59 --- /dev/null +++ b/git/.config/git/ignore @@ -0,0 +1,2 @@ +.ccls-cache +compile_commands.json diff --git a/git/.gitconfig b/git/.gitconfig deleted file mode 100644 index 260be78..0000000 --- a/git/.gitconfig +++ /dev/null @@ -1,37 +0,0 @@ -[user] - email = mattst88@gmail.com - name = Matt Turner - signingkey = 0xACEB29740C9A4E97! -[includeIf "gitdir:~/projects/gentoo/"] - path = ~/projects/gentoo/.gitconfig -[color] - ui = auto -[rebase] - autosquash = true -[core] - excludesfile = /home/mattst88/.global_ignore - autocrlf = false - filemode = false - pager = less -+F -[diff] - renames = true -[push] - default = simple -[alias] - fixes = show -s --pretty='format:Fixes: %h (\"%s\")' - co = checkout - br = branch - shwo = show - grpe = grep - lgo = log - last-commit-to = log -n 1 --pretty=format:%H -[init] - defaultBranch = main -[fixup] - menu = fzf --height '60%' \ - --bind 'tab:toggle-preview' \ - --bind 'space:preview-page-down' \ - --preview 'git show --color {+1}' \ - --preview-window=up:80% \ - --preview-window cycle \ - --prompt 'Select commit: ' diff --git a/git/.global_ignore b/git/.global_ignore deleted file mode 100644 index 25b4c59..0000000 --- a/git/.global_ignore +++ /dev/null @@ -1,2 +0,0 @@ -.ccls-cache -compile_commands.json -- cgit v1.2.3