GitNoon Lesson 2

Get Ready for Lesson 2!

Quick Setup

git config --global user.name "Your Name"
git config --global user.email "your.email@example.com"
git config --global core.editor nano
git config --global init.defaultBranch main
# For Linux or macOS:
git config --global core.autocrlf input
# For Windows:
git config --global core.autocrlf true
# If you're behind a corporate proxy on Windows
git config --global http.sslBackend schannel

mkdir blog
cd blog
git init
echo "# Entry 1" > entry_1.md
git add entry_1.md
git commit -m "Add first blog entry"
git status

Thanks

• To the host for the great venue!
• To our sponsors

Administrivia

• Fire escapes
• Toilets
• Cleaning up after ourselves
• WiFi

Lunch Talk: Exploring History

• Getting value from the time you spend crafting clean commits and helpful commit messages
• Our key tools:
  • git log
  • git blame
  • git bisect
• The power of plain text

Answering Questions with git log

• We’ve already used git log to list commits
• git log can be customised with options
• git log --help lists the available options
  • Hold arrow keys to scroll up and down

What has Guido worked on lately?

git log --stat --author "Guido"

--stat counts lines changed in each file

What is the history of our README?

git log --stat --follow -- README.rst

How was issue 123458 fixed?

git log --grep "gh-123458:"

When was parse_entry removed?

git log --patch -S "parse_entry"

Combine options for more power!

Answer very specific questions like:

Didn’t Ben make an important change to login.html the week before we went on holiday?

git log \
    --author Ben \
    --since 2023-12-18 \
    --until 2023-12-22 \
    -- login.html

Who wrote this?

git blame -- README.rst

When did this break?

• git bisect start bad1 g00d
  • Git “checks out” commit halfway between for you to inspect
• git bisect good
• git bisect bad
• git bisect bad
• To clean up:
  git bisect reset
• If you can’t test a commit:
  git bisect skip
• You can even supply a test script!

The Power of Plain Text

Plain Text Tools

• Markdown to pdf, docx, html, etc. → Pandoc
• Diagrams → Mermaid
• Markdown/HTML slides → Reveal.js
• Markdown websites → Jekyll, Decap CMS
• Documentation sites → Docsify, MkDocs
• “Infrastructure as code” → OpenTofu, Ansible
• Jupyter Notebooks → Jupytext
• Accounting → plaintextaccounting.org

Tutorial 1 Recap

Git commands that alter your repository

---
config:
  mirrorActors: false
---
sequenceDiagram
    Working Directory->>Staging Area: git add
    Staging Area->>Local Branch: git commit
    Local Branch->>Working Directory: git restore
    Local Branch->>Local Branch: git revert
    Local Branch-->>Working Directory: (changing the current commit updates files)

Tutorial Objectives

1. Configuring your GitHub account to support SSH authentication
2. Sharing repos on GitHub
3. Updating remote and local repos
4. Instructing Git to ignore certain files
5. Publishing a repo as a website on GitHub

Tutorial 2 Commands Recap

---
config:
  mirrorActors: false
---
sequenceDiagram
    box Local Repository
        participant Working Directory
        participant Staging Area
        participant Local Branch
        participant Remote Branch Reference
    end
    box Remote Repository (e.g. GitHub)
        participant Remote Branch
    end
    Working Directory->>Staging Area: git add
    Staging Area->>Local Branch: git commit
    Local Branch->>Working Directory: git restore
    Local Branch->>Local Branch: git revert
    Local Branch->>Remote Branch: git push
    Remote Branch->>Remote Branch Reference: git fetch
    Remote Branch Reference->>Local Branch: git merge --ff-only origin/*
    Local Branch-->>Working Directory: (changing the current commit updates files)

Homework