diff --git a/git/git.xdg.symlink/config b/git/git.xdg.symlink/config index 4114b1f..dfbce30 100644 --- a/git/git.xdg.symlink/config +++ b/git/git.xdg.symlink/config @@ -12,6 +12,7 @@ defaultBranch = main [alias] + amend = commit --verbose --amend dc = diff --staged di = diff pf = pull --ff-only @@ -21,6 +22,8 @@ ci = commit --verbose co = checkout cp = cherry-pick + cpc = cherry-pick --continue + cpq = cherry-pick --abort current-branch = rev-parse --abbrev-ref HEAD cl = clone ll = !max-git-log @@ -30,12 +33,16 @@ s = switch b = switch -c lt = log --oneline -10 + r = rebase + rc = rebase --continue + rq = rebase --abort + ri = rebase --interactive [color] ui = auto [help] - autocorrect = prompt + autocorrect = never [push] default = current diff --git a/git/git.xdg.symlink/gitignore b/git/git.xdg.symlink/gitignore index 997a884..8022e0f 100644 --- a/git/git.xdg.symlink/gitignore +++ b/git/git.xdg.symlink/gitignore @@ -18,7 +18,9 @@ GoToFile .idea .nova +.zed .pick_index +.claude # Files I want to have but not stage *.maxignore diff --git a/git/git.xdg.symlink/ignore b/git/git.xdg.symlink/ignore new file mode 100644 index 0000000..66d62f8 --- /dev/null +++ b/git/git.xdg.symlink/ignore @@ -0,0 +1 @@ +**/.claude/settings.local.json