Git

Introduction

• Git Tutorial • 6 video playlist • Ben Kadel 📺
• Git Tutorials • 7 video playlist explaining git basics on a whiteboard • GitKraken 📺

General

• Git by example: Interactive guide • Anton Zhiyanov 📖

Undoing mistakes

• How to undo (almost) anything with Git • GitHub Blog 📖
• How to remove previously committed files now in .gitignore:
  • Clear .gitignore cache
  • caching - Ignore files that have already been committed to a Git repository - Stack Overflow
  • How do I make Git forget about a file that was tracked, but is now in .gitignore? - Stack Overflow

Branching & Merging

• How to branch off of a feature branch (while you wait for the feature branch to be merged):
  • In GitHub flow, is it OK to base feature branch on another feature branch? • Stack Exchange 👩‍💻
• Resolving a merge conflict:
  • The EXTREMELY helpful guide to merge conflicts • Starts with a great explanation (with visuals) of what a merge conflict actually is, followed by a walkthrough of how to use a 3-way merge editor to resolve one • Visual Studio Code 📺
  • Lazygit if simple enough to chose one side or the other
  • VS Code if more complex? Neovim?
• Reverting a merge:
  • See Undoing a Merge to Your Main Git Branch
• Deleting merged branches:
  • Clean up your Git branches • Jamie Tanna 📖
• Wait, what does a BRANCH do again? • A branch is a pointer to a single commit; it’s not a collection of related commits • GitKraken 📺

Searching Git History

• git log
• cli approach
  • search entire git history for any text with git log -S <string>
    • Search all of Git history for a string - Stack Overflow
    • works by searching all diffs that add or remove an instance of that string (i.e. that changed how many references to that string there were)
      • use -G instead of -S to simply find all diff lines that match the regexp (regardless of whether the number of instances in the file changed)
    • gives a list of commits with diffs that contain the search string
    • add -p to the command to see the diffs too in a less pager you can search with / or page through with ctrl-f/b
  • is there a way to configure git to send the output of git log -S <search string> to vim (the way I do with kitty’s scrollback buffer / command output)?
    • or, can I at least cat everything instead of paging it with less so that I can then send the kitty output to nvim my usual way?
• lazygit
• vs code / GitLens
• vim fugitive
• Git log customization • Justin Joyce 📖
  • improve my git log output in Lazygit?
  • improve my git log output in CLI?

Searching current codebase

• avoiding noisy git matches (beginner - intermediate) anthony explains • Using a .gitattributes file to mark certain files as binary so their contents won’t clutter git grep results • Anthony Writes Code 📺

Committing

• Git commit and commit message best practices • Commit focused changes often with short, descriptive messages that make those commits easy to squash or revert later without unintended side effects • Justin Joyce 📖
• How atomic Git commits dramatically increased my productivity - and will increase yours too • Samuel-Zacharie Faure 📖

Diffing

• Git Diff • Basic CLI output using --stat to see just the list of changed files with their changed line counts • Justin Joyce 📖
• quick way to diff two text blocks? e.g. was just on a call where a few lines were thought to be the same (and could be extracted), but that was determined just by eyeballing — what would be a better alternative to prove whether the text is actually the same?

Forking

• Configuring a remote repository for a fork • You must configure a remote that points to the upstream repository in Git to sync changes you make in a fork with the original repository. This also allows you to sync changes made in the original repository with the fork • GitHub Docs 📚
• Git commands to keep a fork up to date • Phil Nash 📖
• Syncing a fork • GitHub Docs 📚
• Clean up a fork and restart it from the upstream • Stack Overflow 👩‍💻
• Force your forked repo to be the same as upstream • Glenn Block 👩‍💻
• Syncing your fork to the original repository via the browser • Kirstie Jane 👩‍💻
• Quick Tip: Sync a Fork with the Original via GitHub’s Web UI • Bruno Skvorc
• Creating a pull request from a fork • GitHub Docs 📚

Configuration

• Popular git config options • Julia Evans 📖
• Better git diff with delta • Pawel Grzybek 📖
• Sorting Git branches • Cassidy Williams 📖
• is a global ignore file a bad practice when collaborating? would it be better not to have it so I/we am/are prompted to ignore those files at the project level?
  • prompted by a project that included (didn’t ignore) some source files in a dist/ directory
  • after using one for awhile, I think it’s actually not great when working on shared projects

Git worktrees

• use via Lazygit?
• use via VS Code?
• use via neovim?
  • Git Worktrees and Neovim: A Match Made in Coding Heaven • DevOps Toolbox 📺

Other concepts

• How HEAD works in git • Julia Evans 📖

Inbox

• .git-blame-ignore-revs file:
  • Ignore commits in the blame view • GitHub Docs 📚
• Git is my buddy: Effective Git as a solo developer • Mikkel Paulson 📖
• How to merge multiple Git repos and keep their commit history • Graham F. Scott 📖
• Some miscellaneous git facts • Julia Evans 📖
• git-tips/tips: Most commonly used git tips and tricks.
• revert a commit to main that wasn’t a pr: open a new branch from main; revert commit; push changes; open pr; merge pr (could also just revert commit directly, but this is how to use a pr workflow for a commit reversion)