Tag: git

ai april fool baselining ci circle ci code quality code review conference talk decoupling generics gerrit git interview legacy observability open source performance php language extensions phpstan phpstan rule test helper psalm rector sarb software design static analysis symfony test splitter testing types video workshop xdebug

Talks

The Git Eureka moment

Let me share my git eureka moment with you. The moment when suddenly everything git related made sense. We'll delve just below the surface to understand what commits and branch really are. With these concepts cemented we'll look at some of git's more advanced features.

Videos

Git tips and tricks. Day 15: git rebase -i (part 1)

Git's rebase functionality is one of its most powerful features. Today we'll learn how to use interactive rebase to reword commit messages.

Git tips and tricks. Day 16: git rebase -i (part 2)

Learn how you can reorder commits and combine 2 commits into one with interactive rebase.

Git tips and tricks. Day 14. git reset

Today we learn how to split the previous commit into 2 commits using git reset.

Git tips and tricks. Day 21: git cherry-pick

Learn how you can make cherry pick a commit from another branch, on to the branch you're currently work on.

Git tips and tricks. Day 23: git bisect

Was a feature working last week and has been reported as broken today?

Git tips and tricks. Day 11: template commit messages

Learn how to create a template git commit message.

Git Tips and Tricks. Day 2: git log (searching)

This video show various ways of searching and filtering with git log

Git Tips and Tricks. Day 7: git add

Learn about the following git add flags:

Git tips and tricks. Day 24: git push --force-with-lease

Force-pushing is one of the most dangerous things you can do in Git. It is, sometimes, necessary.

Git tips and tricks day 6: git shortlog

Learn how you can see a summary of the git commits made by each person on the project.

Git tips and tricks. Day 18: git rebase -i (part 3)

Learn how we can use interactive rebase to change commits in the past. In this example we're splitting an existing commit into 2.

Git tips and tricks. Day 12: git commit -o --dry-run

Have you spent ages carefully creating a set of changes in the staging area to be committed, only to realise that you want to commit a completely different set of files?

Git tips and tricks. Day 25. Vanity SHAs

This one surprised me. It's true, you can have vanity git SHAs!

Git Tips and Tricks. Day 4: git log -L

Learn how you can follow changes to a single method with git.

Git tips and tricks. Day 22: git reflog

You know that moment when you’ve just nuked your Git repo…

Git tips and tricks. Day 10: git commit

Learn about the following git commit flags: -a, -p, -m --allow-empty

Git tips and tricks. Day 20. git config alias

Save typing and your keyboard by using aliases to provide shortcuts for the common git commands you use.

Git tips and tricks. Day 13: git commit --amend

Made a mistake with the commit you've just created? Don't panic! With git you can rewrite your git history. Today we take the first step using git commit --amend

Git tips and tricks. Day 8: git diff/git restore

In this video we'll see how to use git diff to see what changes we'er about to commit.

Git tips and tricks. Day 9: git add -N

See how you can move untracked files to the working tree using git add -N

Git tips and tricks. Day 17: git rebase -i --autosquash

My favourite git find of 2025!

Git tips and tricks day 5: git show

With git show we can look at any git commit, tag or branch.

Git tips and tricks. Day 19: git branch

Today we're learning about branches.

Git Tips and Tricks. Day 3: git log --follow

This shows how git can track changes to a file even when the file is renamed or moved.

Git Tips and Tricks. Day 1: git log (display options)

This shows how to use options on the git log command to control the output.