Or: “Everybody likes being given a glass of water.”
By Merlin Mann.
It's only advice for you because it had to be advice for me.
Update 2022: git checkout -p <other-branch>
is basically a shortcut for all this.
FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.
Example: You have a branch refactor
that is quite different from master
. You can't merge all of the
commits, or even every hunk in any single commit or master will break, but you have made a lot of
improvements there that you would like to bring over to master.
Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.
#!/bin/sh | |
# router name generator | |
# [ omachonu ogali / oogali at blip dot tv / @oogali ] | |
# | |
# README: | |
# 1. point at your router with a community | |
# 2. finesse names as needed into your DNS zones | |
# 3. have a cold beverage of your choosing. | |
# |