Skip to content

Latest commit

 

History

History
70 lines (55 loc) · 2.01 KB

README.md

File metadata and controls

70 lines (55 loc) · 2.01 KB

Checklist to get a new laptop ready

  • Setup 1Password Desktop
  • Configure 1Password ssh agent
  • Clone this repo
  • Apply macOS settings (run settings/defaults script)
  • Install brew
  • Install packages from brewfile
  • Install oh-my-zsh
  • Symlink files via symlink-dotfiles script
  • Configure 1Password for commit signing
  • VPN
  • Setup iterm config file
  • Setup gcloud CLI
  • .gitconfig.local overriding git email with company's email
  • Config username "adriaarcarons" for ssh logins in (~/.ssh/config)
Host *
	User adriaarcarons

git aliases

The .git_aliases file is a snapshot of what is found in this repo. Follow the instructions there to install it.

brewfile

Dump currently installed packages to Brewfile

  • brew bundle dump --all --describe --force

Git commands for my usual git workflows:

Create feature branch from master, sync it with remote, close it.

Workflow 1

  1. g topic-begin <feature-branch> to start working on a new feature
  2. g topic-sync pulls and pushes
  3. g topic-move to rename the branch, also in remote

This workflow depends on the trunk branch being set g topic-base-branch master once, if master is the trunk branch. Defaults to main.

Workflow 2

  1. g co -b <branch_name>
  2. g publish to push to remote
    1. g unpublish to undo

Prune local branches that are not tracked in remote

  • g hew-local Delete all local branches that have been merged into a commit
  • g hew-local-dry-run dry run version

Trigger CI pipeline:

  • g ca to commit --amend
  • g push

Other useful commands

  • g summary
  • g churn
  • g init-empty
  • g grep-all Find text in any commit ever.
  • g lsio list files that git has ignored.
  • g ds show staged changes (about to be committed)

Copyright notice

Part of the code in this repo is copied or heavily inspired by other authors.

Credits given to: Yusei Nishiyama Erik Bartels