Adam Johnson

@adamj.eu

3353 Followers 266 Following

🐴 @djangoproject.com blogger and contributor ✍️ Author of three books on Django and Git 🍕 Django London co-organizer 🇬🇧 London / 🇵🇹 Lisbon

Running IPython today gives you the tip "Happy International Transgender Day of Visibility! You are valid. You matter."

A carton of four “Giga” apples (tagline: “mighty good”)

Speed Up Your Django Tests

Boost Your Django DX: Tools and techniques to improve your development experience

Boost Your Git DX: Make your Git development experience super smooth

Boost Your Django DX: Tools and techniques to improve your development experience

Flash Magic Eraser packet, tagline: Erases up to 100% of impossible stains.

Line chart of page count in Boost Your GitHub DX, climbing up to 250 pages on 6th July

Two examples:

1. `git rev-list --count @` counting all the commits in the repository.

2. `git rev-list --count @ --grep "pre-commit autoupdate"` counting all automatic update commits from pre-commit.

Adam Johnson and Anthony Shaw presenting ice cream in London

Black-and-white graffiti art of a female face by Abraham.O

Two commands:

1. 'git log --since 1.day.ago' to show commits from the last 24 hours.

2. 'git log --since 2025-04-01 --until 2025-04-08' to show commits in the first week of April 2025.

Example of running `gh issue develop -c`.

Example commit message showing two co-authors.

Running 'gh pr view -w', which outputs 'Opening https://github.com/django/django/pull/17554 in your browser.'.

An example of running htmx.logAll() in the browser JavaScript console, followed by a log of events triggered by a button press.

An example form with a custom BoundField class to add a CSS class to its <label> tag.

An example model using `models.CompositePrimaryKey`.

./manage.py shell running and importing two model classes automatically.

Example use of contextlib.contextmanager to create a function decorator that disables logging for the duration of the function call.

Hide the pain Harold running git blame

Harold forcibly grinning at commit message "updates", 7 years ago

Line chart of page count in Boost Your GitHub DX, climbing up to 167 pages on 25th March

GitHub comment “Any updates on this?” being hidden as spam.

Django template showing the body tag with the hx-headers attribute configured to add the CSRF token to all requests as the x-csrftoken header.

Example of GitHub’s “Warning” alert Markdown that says “Vibe-coded“

1. Enabling the option with `git config --global log.follow true`
2. Exmaple command, `git log example/widgets.py`, now follows file renames.

It’s dangerous to Git alone! Take this:

Boost Your Git DX

An invocation of `git restore -p` showing a diff hunk that changed a variable and the prompt “Discard this hunk from worktree?”

Two commands:

1. `git show b380` shows a commit.
2. `git show a721` fails due to the prefix being ambiguous. It lists two candidate commits, allowing the user to try again with a longer unambiguous prefix.

A look at the different minimum standards for chocolate imposed in the US and the European Union might also lead someone to this conclusion. Milk chocolate in the EU must contain 30% cocoa, whereas in the US it need only
contain 10%. But these figures are very deceptive. The US requirement for 10% cocoa refers only to non-fat cocoa powder. The overall amount of cocoa, including cocoa butter, will be higher. In the EU, meanwhile, the requirement for chocolate to contain 30% cocoa refers to both cocoa powder and cocoa butter, so the
percentage of cocoa powder alone will be lower.

Line chart of page count in Boost Your GitHub DX, climbing up to 104 pages on 11th March

Running `git log --author Adam` to find commits by myself in Django.

Screenshot of the web help for `git commit`.

Output of `git log --graph --oneline --all` showing the branching connections between three branches.

Boost Your GitHub DX beta edition cover with “Cover art” in a spiral as the cover art.

Two commands:

1. `git ls-files` listing a bunch of files.
2. `git ls-files '*.rst' '*.py'` listing only files with those suffixes.

Title: Boost Your GitHub DX book page count
A line goes from ~15 pages on 23 February to 73 pages on 5 March.

Person: Why should I read docs, books, or blogs when I can ask an LLM?

Angry goose: WHERE DID THEY GET THE TRAINING DATA?

Two commands:

1. `git show -s --format='%s'` shows the subject of the latest commit.
2. `git show -s --format='%s' main` shows the subject of the commit referenced by `main`.

Three commands using the option:

1. `git diff -U10`
2. `git log -p -U10`
3. `git show -U10`

Three commands:

1. Ignore the “scratch” directory without modifying `.gitignore`: echo /scratch/ >> .git/info/exclude
2. Make it: mkdir scratch
3. Store test logs in it: pytest | tee scratch/test.log

Examples of the commands as dsecribed in the text:

1. `git commit --amend`
2. `git commit --amend --no-edit`
3. `git commit --amend --date now`

Running `git show main:README.rst` and getting the contents of Django’s README file.

two spidermen pointing at each other

spiderman 1: me, running git blame

spiderman 2: me, 7 months ago

person labelled “developer”

butterfly: LLM generates "Added new database model"

developer: is this a commit message?

Mufasa: Look, Simba. Everything the light touches is our beautiful, well-maintained code base.

Simba: But what's that shadowy place over there?

Mufasa: API V1, which still handles 95% of requests.

Command: `git log --oneline --reverse main..` showing three commits on a feature branch, oldest first.

Example showing how setting `advice.statusHints` to `false` removes command hints from the output of `git status`.

Three commands:

1. `git stash example/views.py` to stash a bug fix.
2. `pytest` to run a changed test and check that it fails.
3. `git stash pop` to unstash the bug fix.

Two commands:

1 git commit -m 'Fix typo' README.md

2. git commit -m 'Tidy tests' '*test*'

`git show @` - see latest commit
`git show @~` - see previous commit
`git show @~~` - see previous-previous commit
`git reset --soft @~` - undo to previous commit

Run 'git config --global checkout.workers 0' to set this option

Terminal window showing `git rebase main -x pytest`