Generated File: Do Not Edit Directly Edit the source files and rerun the generator.

Git Tips

Generated from README.md. Each heading becomes a page, with quick keyboard navigation for reading.

PageDown x2 jumps to the next slide. PageUp x2 goes back. Home keeps you on this index.

Start Reading
  1. My opinionated tips about GitSlide 1
  2. How to use this Git RepoSlide 2
  3. Git Hosting ProvidersSlide 3
  4. `checkout` -> `switch` + `restore`Slide 4
  5. One directory per PRSlide 5
  6. Creating a PR easilySlide 6
  7. `git diff` via Pager, not IDESlide 7
  8. How to Use Multiple Git Configs on One ComputerSlide 8
  9. `git diff main` vs `git diff origin/main`Slide 9
  10. Merge upstream branch oftenSlide 10
  11. Create a backup of a branchSlide 11
  12. Squash PRsSlide 12
  13. List branchesSlide 13
  14. Switch back to previous branchSlide 14
  15. git stashSlide 15
  16. Accidentally Commit on Branch `main`Slide 16
  17. Restore a single fileSlide 17
  18. Restore interactivelySlide 18
  19. `git diff` of pull-requestSlide 19
  20. Show Changes to a single fileSlide 20
  21. Find removed codeSlide 21
  22. Find branch which contains a commitSlide 22
  23. `gitk`Slide 23
  24. I don't care much for git historySlide 24
  25. rebase vs mergeSlide 25
  26. List all filesSlide 26
  27. List all files in sibling reposSlide 27
  28. AutocompletionSlide 28
  29. Solving Conflicts with `meld`Slide 29
  30. Solving Conflicts: OverviewSlide 30
  31. Misc: Search with Editor, not with your eyesSlide 31
  32. Misc: ripgrep: recursive grep which respects .gitignoreSlide 32
  33. Misc: atuinSlide 33
  34. git diff shows no changes?Slide 34
  35. Automatically prune on fetchSlide 35
  36. Pick some lines from another branch with `git difftool`Slide 36
  37. pre-commit.comSlide 37
  38. gitleaks via pre-commitSlide 38
  39. Public `.envrc` file, private `.env` fileSlide 39
  40. Long branch names are fineSlide 40
  41. GitHub: Tab width: 4Slide 41
  42. GitHub: open PR in web UISlide 42
  43. GitHub: Play a sound when a CI job is finishedSlide 43
  44. GitHub: Keep Actions/Workflows simpleSlide 44
  45. VS Code: autoFetchSlide 45
  46. Starship PromptSlide 46
  47. restore, revert, resetSlide 47
  48. delete merged branchesSlide 48
  49. git bisectSlide 49
  50. git bisect for lazy peopleSlide 50
  51. Squash all commits into a single commitSlide 51
  52. Empty commitSlide 52
  53. Show one commit in difftoolSlide 53
  54. Resolve, take theirsSlide 54
  55. git log over many git reposSlide 55
  56. Merging some parts of a different branchSlide 56
  57. Show change of merge commitSlide 57
  58. cherry-pick -nSlide 58
  59. parent branch / base branchSlide 59
  60. Merge PR base branch into current branchSlide 60
  61. Undelete a branchSlide 61
  62. Taskfile stamp files per task nameSlide 62
  63. Git submodulesSlide 63
  64. Chain of branches: Add base branch to name of second branchSlide 64
  65. History for selectionSlide 65
  66. Which line ignores a file?Slide 66
  67. cli tool `forge`Slide 67
  68. TODOSlide 68
  69. MoreSlide 69
Generated File: Do Not Edit Directly Edit the source files and rerun the generator.