1 hour ago · 34 min read6878 words · Tech · hide

Table of Contents Table of Contents The Mental Model The Basics, Briefly A Configuration Worth Having Different Identities per Directory Merge or Rebase rerere: Resolve Each Conflict Once Recovering From Mistakes The Reflog Undoing a Stacked Rebase What the Reflog Doesn’t Know The Three Kinds of Reset Cleaning Up Before You Share Fixup Commits and Autosquash Stacked Branches With —update-refs Comparing Two Versions of a Branch Cherry-Picking Ranges and Conflicts When Not to Cherry-Pick Worktrees: Several Branches at Once Reviewing Pull Requests in a Worktree What Is Shared and What Isn’t How I Lay Them Out Finding Things in History Signing Commits What a Signature Proves, and What It Doesn’t Three Signature Formats OpenPGP on a Smartcard With oct-git Rewriting History Drops Signatures Checking Signatures lazygit: The Same Ideas, Fewer Keystrokes Housekeeping What This Article Doesn’t Cover The Command Card I Actually Use Conclusion Further Reading Git is one of those tools everybody…

Commenting on Bubbles has been removed. Why? If you want to talk about this post, write to the author, use the comments on their blog if it has them, or reply with a "RE:" post on your own blog. Suggestions? feedback@bubbles.town