Re: Merging a branch in GitHub - the hard way Notes
In reply to: Re: Merging a branch in GitHub - the hard way
Had you ever considered just using history rewriting in git itself?
Music, comics, art, and other stuff, all in one gigantic pile. The web of yesterday, tomorrow!
In reply to: Re: Merging a branch in GitHub - the hard way
Had you ever considered just using history rewriting in git itself?
I mentioned my crappy approach to using multiple GitHub accounts on a Slack I’m on, and someone else pointed out there’s a much easier approach: Instead of using wrapper scripts to set up different environments, you can fake it using .ssh/config
and .gitconfig
rules.
First, set up key rules with .ssh/config
:
Next, set your origin based on whether the workspace is work or personal; for example, git clone git@github-work:work-org/project.git
(and of course you can git remote set-url origin
for existing workspaces).
Finally, to handle the different author name and email, git 2.15 and later support conditional includes. If you keep all of your work projects in a separate directory, you can put this into your .gitconfig
:
then .gitconfig-work
includes your work-specific configuration, e.g.:
Thanks, Silas!