diff --git a/.config/1Password/ssh/agent.toml b/.config/1Password/ssh/agent.toml index 51ffed6..37050e0 100644 --- a/.config/1Password/ssh/agent.toml +++ b/.config/1Password/ssh/agent.toml @@ -34,3 +34,4 @@ vault = "Private" [[ssh-keys]] item = "SSH Key (target github)" vault = "Target" + diff --git a/.gitconfig b/.gitconfig index 0c60b80..58c2f68 100644 --- a/.gitconfig +++ b/.gitconfig @@ -17,8 +17,29 @@ tst = status co = checkout tco = checkout ref = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format='%(refname:short)' +amend = commit --amend +untrack = rm --cached +unadd = restore --staged +softadd = add --intent-to-add + +# init new git repo with empty initial commit +start = !git init && git commit --allow-empty -m \"Initial commit\" + +# create a git repo including everything in this dir +initthis = !git init && git add . && git commit -m \"Bootstrap commit\" + +slog = log --pretty=format:'%C(auto)%h %C(red)%as %C(blue)%aN%C(auto)%d%C(green) %s' +l = slog +# Logs commits matching current author +lome = "!git slog --author=$(git config --get user.name)" +# Switch to master/main/trunk; whatever the default branch is in the repo +swm = !git switch $(basename $(git symbolic-ref --short refs/remotes/origin/HEAD)) + +remoteurl = "remote get-url origin" +remotehttps = "!git remoteurl | sed -e 's/git@/https:\\/\\//'" +remotecopy = "!git remotehttps | pbcopy" [include] path = .gitconfig.local [push] - autoSetupRemote = true +autoSetupRemote = true diff --git a/.iterm2/AppSupport b/.iterm2/AppSupport index 12afa0b..2aef17b 120000 --- a/.iterm2/AppSupport +++ b/.iterm2/AppSupport @@ -1 +1 @@ -/Users/Z002QRN/Library/Application Support/iTerm2 \ No newline at end of file +/Users/joelillibridge/Library/Application Support/iTerm2 \ No newline at end of file diff --git a/.zshrc b/.zshrc index a83995c..fbbd8e9 100644 --- a/.zshrc +++ b/.zshrc @@ -6,6 +6,7 @@ OPTIONS=( append_history share_history histignorealldups + INC_APPEND_HISTORY ## Gonna slowly turn these on and see what I like