Skip to content

Conversation

@tctibbs
Copy link
Owner

@tctibbs tctibbs commented Dec 7, 2025

Summary

  • Add .gitconfig with useful defaults and aliases
  • Symlink via setup.sh (no user identity - works across personal/work machines)

Git Config Contents

Defaults:

  • push.autoSetupRemote - No more --set-upstream needed
  • pull.rebase - Cleaner history
  • fetch.prune - Auto-cleanup deleted remote branches
  • merge.conflictStyle = diff3 - Shows base version in conflicts

Aliases:

  • git amend - Amend last commit without editing message
  • git wip - Stage all + commit with "WIP" message
  • git undo - Undo last commit, keep changes staged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants