Git

Switching branches with uncommitted changes that aren’t ready for a commit, Git stops you. $ git checkout develop error: Your local changes to the following files would be overwritten by checkout: file.txt Please commit your changes or stash them before you switch branches. Aborting git stash saves the working-tree changes onto a temporary stack and resets the working tree to HEAD. The changes aren’t lost; you reapply them later. The commands are simple, but the difference between apply and pop, and what pop does on a conflict, is where mistakes happen. ...

Opening a PR, waiting on CI, reviewing, and merging usually bounces you across several browser tabs. The GitHub CLI (gh) handles the whole process from the terminal. Install instructions vary by OS, so follow the official guide (brew install gh on macOS, sudo apt install gh on Ubuntu/Debian). After installing, authenticate once. gh auth login Browser-based OAuth is the simplest choice. Confirm it worked with the following. $ gh auth status github.com ✓ Logged in to github.com account in-jun (keyring) - Active account: true - Git operations protocol: https - Token scopes: 'gist', 'read:org', 'repo', 'workflow' 1. Create the PR First, branch and push your work. ...

Building a single feature locally leaves a history like this: f16a902 Add logout feature fbfb5b2 Fix login button style 6cc4fec Add missing import cacd382 Fix typo in login 0559677 Add login feature Fix typo, Add missing import, and Fix login button style all belong inside Add login feature. Committing often while you work is fine: nothing gets lost and you have plenty of rollback points. But pushing it as-is forces your reviewer to read four meaningless commits. ...

Once a PR is merged, the local branch behind it is dead weight. After a few months git branch scrolls past a screenful and you can’t find the branch you’re working on. The commands to clean this up are simple. The point is knowing what’s safe to delete. -d is safe, -D is dangerous There are two ways to delete a local branch. git branch -d deletes only branches that are already merged. If unmerged commits remain, it refuses. ...

Structure of Git Timestamps Git’s timestamp system was designed to record two separate times from when Linus Torvalds designed Git in 2005. This was because in Linux kernel development, the time a patch was written and the time it was actually committed could differ. AuthorDate and CommitDate Git commits have two timestamps. AuthorDate represents when the code was first written, meaning when the original author made the change. It is set via the git commit --date option or the GIT_AUTHOR_DATE environment variable. ...