update "hacking" files to match

there are two of these.  I've merged the more recent changes and added a note about git-fetch.