Creating and Managing SSH Keys with 1Password

A walkthrough of creating and managing SSH keys with 1Password 8, all the way through git clone.

Articles I use for position talk as a git rebase opponent

Quotes I lean on when making the case against git rebase in team discussions.

Installing Git on CentOS 6.3 with yum

A short note on installing Git 1.7.1 on CentOS 6.3 with plain yum.

[CircleCI] Writing [ci skip] in commit message skips CI execution

Including [ci skip] in a commit message tells CircleCI to skip the build for that commit.

108 things to do first when contract development starts

A kickoff checklist for contract dev projects covering tooling, product owner, priorities, and release flow.

What's the Difference Between Git and GitHub?

A link collection I hand out when someone asks how Git and GitHub differ.

How to fork from GitHub to Bitbucket as Private repository while developing

How to run a public GitHub repository as a fork inside a free Bitbucket private repository.

git add -p is Short for git add --patch

git add -p is short for --patch, not --partial — a small discovery from the git add help output.

[Git] Command to Bulk Delete Merged Remote Branches

Bulk deleting merged remote Git branches with git branch --merged and xargs, then pruning stale refs.

[Git] How to Fix error: cannot lock ref 'refs/remotes/origin/xxx': 'refs/remotes/origin/xxx/yyy' exists;

Resolving the git fetch cannot lock ref error by pruning stale remote refs with git remote prune origin.

[Git] Clone by specifying a specific branch from remote

Use git clone -b <branch> to clone straight into a specific branch from a remote repository.

[Git] Solution for "error: There was a problem with the editor 'vi'" Error

Fixing the git commit vi editor error by setting core.editor to your Vim path.

[Git] About Commit Granularity and Good Commit Messages

Personal habits for keeping commits small and messages meaningful, with reference articles.

[Git] Skip .git/hooks/pre-commit when committing

Skip the pre-commit hook with git commit --no-verify (-n) when a legacy hook gets in the way.

Root Cause and Permanent Solution for Permission denied Error on git commit in macOS

I suddenly encountered a Permission denied error when running git commit on macOS. While I introduced a workaround in a previous article, this time I was able to identify and solve the root cause, which I'll share with you here.

Causes and Workaround Solutions for git commit Permission denied on macOS

Getting `Permission denied` when trying to `git commit` on macOS...? Don't panic - let's isolate the cause and resolve it. This article introduces safe methods to fix the error, from checking Git hooks to macOS temporary directory issues.

[Git] Command to delete all merged local branches

Delete all merged local Git branches (except master / develop) and wrap the command in a .gitconfig alias.

[Git] diff-highlight: command not found Error

Symlink Homebrew Git's contrib/diff-highlight into your PATH to fix the command not found error.

How to Change File Names and Directory Names Case in Git

How to change the case of file and directory names in Git using git mv.

Collection of Good Articles for Getting Started with Git

A curated collection of articles and slides for getting started with Git.

[Git] How to Set Files to Ignore in All Git Repositories Using Global .gitignore

How to configure `core.excludesfile` so a single `.gitignore` applies to every Git repository.

git log -S can search for code deleted in the past

How to use `git log -S` to find commits that added or removed a specific piece of code.

Collection of Japanese and English Articles to Understand the Difference Between git merge --ff and --no-ff

Reference articles on `git merge --ff` vs `--no-ff`, plus how I use `--no-ff` by default.

[Git] How to enable --no-ff (no fast-forward) by default

How to enable `git merge --no-ff` by default using an alias or `mergeoptions` config.

[Git] How to change case of file names and directory names

Use `git mv -f` when you only want to change the case of a file or directory name in Git.

[Git] Command to return to pre-merge state when conflict occurs during merge

The one-liner `git reset --hard ORIG_HEAD` to return to the pre-merge state after a conflict.

[Git] How to Restore Deleted Files

Three-step recipe using `git rev-list` and `git checkout` to restore a deleted file from Git history.

[Git] How to revert a merge commit

How to revert a merge commit with `git revert -m 1`, plus the errors you hit without it.

[Git] Solution for fatal: unable to access: SSL certificate problem: Invalid certificate chain

A quick workaround for the Invalid certificate chain error by toggling `http.sslVerify`.

Steps to revert when git stash pop results in conflict

Three commands to revert when `git stash pop` runs into a conflict.

[Git] How to Undo When You Accidentally Execute git push origin master

Safely undo an accidental `git push origin master` with `git revert` instead of force push.

Automating git commit and branch creation with GitHub Actions

A GitHub Actions workflow sample that automates branch creation, commit, and push.

github-changes Can Auto-Generate CHANGELOG.md from Commit Messages

How to use github-changes to auto-generate CHANGELOG.md from commit messages, with a real-world PR example.

[GitHub] Making PullRequests Easier with the hub Command

Use the hub CLI to send GitHub Pull Requests from the command line instead of a browser.

[GitHub] How to Sync a Forked Repository with the Original Repository

How to configure the original repository as upstream and pull in its latest changes for your fork.

Migrated from GitHub to GitLab to use Private Repository for free

GitLab's GitHub import errored out, so I migrated by creating a Blank project and re-pointing git remote before pushing.

[Github] How to update a forked repository to the latest state

Update a forked repository to the latest upstream by pointing git pull at the original repository URL.

[Git] Convenient Service gitignore.io for Easily Generating .gitignore Files

Generate project-ready .gitignore files by hitting the gitignore.io API with a simple curl command.

[Heroku] Deploy only subdirectories

Deploying only the api subdirectory of a monorepo to Heroku with git subtree push.

[Heroku] "Heroku Git error, try again shortly."

Recovering from a Heroku Git error, try again shortly. failure by checking status and retrying the push.

[Heroku] How to git push Branches Other Than master

Deploy a non-master local branch to Heroku with git push heroku branch_name:master.

[Node.js] Run Lint Before git commit with husky + lint-staged

Setting up husky and lint-staged with 'npx mrm lint-staged' to run Lint automatically on git pre-commit.

[Git] Installation Steps for CUI Tool tig

brew install tig to get the Git CUI browser tig set up on Mac quickly.

[macOS] Installing Homebrew (and Git While We're at It)

Installing Homebrew on macOS, verifying with brew doctor, and then installing Git through the package manager.

[macOS Sierra] Solution to Stop Showing 'Enter passphrase for key' Every Time

Adding UseKeychain and AddKeysToAgent to ~/.ssh/config stops macOS Sierra from asking for the SSH passphrase every time.

Writing Documentation in Markdown and Managing Under docs/

Keeping specs and other per-project docs as Markdown under docs/ in the same git repository as the code.

Update nvm version | nvm バージョンアップデート

Running the official nvm manual upgrade shell script to update nvm itself.

WARNING: UNPROTECTED PRIVATE KEY FILE When Copying SSH Public/Private Key Files

How I cleared the `WARNING: UNPROTECTED PRIVATE KEY FILE` error by tightening private key permissions with `chmod 600`.

[Sublime Text 3] How to Install Package Control

Installing Package Control in Sublime Text 3 by cloning the repo into Packages and checking out python3.

[Xcode] Useful .gitignore Settings for iPhone App Development

A .gitignore template for iPhone app development with Xcode and CocoaPods.