Git

Introduction

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

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:
  • 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 📖

Committing

• How atomic Git commits dramatically increased my productivity - and will increase yours too • Samuel-Zacharie Faure 📖

Forking

• Configuring a remote repository for a fork • GitHub Docs 📚

  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.

• 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 📚

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

Git worktrees

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

Inbox

• write about creating a global .gitignore file?
• .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 📖
• 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
• 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
  • Some miscellaneous git facts • Julia Evans 📖