Git alias updates, mostly

This commit is contained in:
Max Bucknell 2025-06-21 10:41:36 -07:00
parent 230a63f480
commit a2cc7f8e18
No known key found for this signature in database
3 changed files with 11 additions and 1 deletions

View file

@ -12,6 +12,7 @@
defaultBranch = main defaultBranch = main
[alias] [alias]
amend = commit --verbose --amend
dc = diff --staged dc = diff --staged
di = diff di = diff
pf = pull --ff-only pf = pull --ff-only
@ -21,6 +22,8 @@
ci = commit --verbose ci = commit --verbose
co = checkout co = checkout
cp = cherry-pick cp = cherry-pick
cpc = cherry-pick --continue
cpq = cherry-pick --abort
current-branch = rev-parse --abbrev-ref HEAD current-branch = rev-parse --abbrev-ref HEAD
cl = clone cl = clone
ll = !max-git-log ll = !max-git-log
@ -30,12 +33,16 @@
s = switch s = switch
b = switch -c b = switch -c
lt = log --oneline -10 lt = log --oneline -10
r = rebase
rc = rebase --continue
rq = rebase --abort
ri = rebase --interactive
[color] [color]
ui = auto ui = auto
[help] [help]
autocorrect = prompt autocorrect = never
[push] [push]
default = current default = current

View file

@ -18,7 +18,9 @@ GoToFile
.idea .idea
.nova .nova
.zed
.pick_index .pick_index
.claude
# Files I want to have but not stage # Files I want to have but not stage
*.maxignore *.maxignore

View file

@ -0,0 +1 @@
**/.claude/settings.local.json