git stuff
2018-09-28 17:41:42.485218+02 by Dan Lyke 0 comments
A Twitter thread on Git tips leads to this:
Fast tip: Enable git rerere right now. "rere" (reuse recorded resolution) replays previous conflict resolution when replaying conflicts in branch merges. git config --global rerere.enabled 1 enables it globally.
git config --global alias.pf 'push --force-with-lease' sets up an alias for pf. Various articles on this are easy to find.
git add -p and git reset -p give you the interactive mechanism for doing what you're probably already doing with git diff and carefully editing away unintended changes.