Code Snippets Sign in

Show what a merge will do before doing it

Bash

Lists the commits and the files a merge would bring in, so a surprise is less likely.

git log --oneline HEAD..feature-branch
git diff --stat HEAD...feature-branch
Download
Git git merge review chris

More in Git

Recover a branch you deleted Git The reflog remembers where HEAD has been for about ninety days, so a deleted branch is almost never really gone. Undo the last commit but keep the changes Git Moves HEAD back one commit and leaves everything staged, which is what you usually want after committing too early. Amend a commit without changing its message Git Adds forgotten files to the previous commit and leaves the message exactly as it was. Find the commit that introduced a bug Git Binary search across history. Mark a known good and a known bad commit and git narrows it down for you. List branches merged into main Git Finds the branches that are safe to delete, and the ones that are not. Search the whole history for a string Git Finds every commit whose diff added or removed a piece of text, including in files long since deleted. Stop tracking a file without deleting it Git For the config file that should never have been committed. Add it to .gitignore afterwards.

Random picks

An RSS feed skeleton Data Formats The minimum a reader needs. Dates must be RFC 822, which is the part most generators get wrong. A GitHub Actions workflow for a Node project Build & CI Caches the dependency install, runs on a matrix of versions, and fails the build on a lint error. Follow redirects and show only the headers Networking Traces a redirect chain to its destination without downloading the body. Upsert a row in SQLite Databases Inserts, or updates the existing row when the unique column already holds that value. Worker pool with a wait group in Go Systems Fixed number of goroutines draining a channel, with the group ensuring main waits for all of them. Watch a command until it succeeds Shell Retries every two seconds and stops the moment the command exits zero. Useful while waiting for a service to come up. A README that people actually read Data Formats The order matters more than the length: what it is, how to run it, how to develop on it. Check a file's checksum Security Verifies a download actually matches what the publisher signed, rather than trusting the transfer.