< description

Notes, thoughts, failures. A blog.

< tags | sort -R | ಠ_ಠ
 
soyuka@soyuka.me ~/soyuka.me/tags/git/

Fast fix diverged branches

You made a pull-request, but now some other changes got merged and branches have diverged. There’s a small tip I use to keep history while re-applying commits.


~400 Words

Rewrite an older commit with rebase and stash

You just commited some modifications, but there you’ve to edit things that are related to a previous commit, which isn’t the last one. So, instead of simply amending the commit, you need some more work to keep clean commits.