From 810fbdb4673eabb31164542974f033528cdf272a Mon Sep 17 00:00:00 2001 From: Joe Lillibridge Date: Wed, 30 Oct 2024 09:49:54 -0500 Subject: [PATCH] wip --- .gitconfig | 22 +++++++++++----------- .gitignore | 3 +-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.gitconfig b/.gitconfig index 3bd046d..fe0bda6 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,22 +1,22 @@ [user] - name = Joe Lillibridge +name = Joe Lillibridge [gpg] - format = ssh +format = ssh [gpg "ssh"] - program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" +program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" [commit] - gpgsign = true +gpgsign = true [alias] - lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative - st = status - tst = status - co = checkout - tco = checkout - ref = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format='%(refname:short)' +lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative +st = status +tst = status +co = checkout +tco = checkout +ref = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format='%(refname:short)' [include] - path = .gitconfig.local \ No newline at end of file +path = .gitconfig.local diff --git a/.gitignore b/.gitignore index be1bca7..70d6ecd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .zprofile.local # Various stuff +.DS_Store *.sock *.swp __pycache__/ @@ -26,8 +27,6 @@ __pycache__/ .config/zsh/plugins .cups .docker/ -.DS_Store -.gitignore_global .gk/repoMapping.json .gnupg .gnupg_*