Skip to main content

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

Committing

Forking

Undoing mistakes

Git worktrees

Inbox

  • write about creating a global .gitignore file?
  • .git-blame-ignore-revs file:
  • 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 πŸ“–