If you’ve committed a number of git commits using a wrong user.name or user.email value, you can re-write previous commits with:
git filter-branch --commit-filter '
if [ "$GIT_COMMITTER_NAME" = "Old Name" ];
git commit-tree "$@";
git commit-tree "$@";
Note that this will re-write all commits on the current branch matching the if condition which may or may not be what you’re looking for, so be careful. push the changes back to your remote origin as needed.
This is based on answers to this question here.
By default, the git install on my MacOS 11.5 creates new projects with a ‘master’ branch, but GitHub which I push to for my remote projects has been creating new projects with a default branch of ‘main’ for some time now.
To move a master branch to main locally, set it as the default branch and then push to GitHub I use the following steps (taken from multiple places but mainly from this article):
Create a new main branch from master locally:
git branch -m master main
Add remote GitHub repo:
git remote add github https://your-repo-url
Pull remote changes from remote main branch
git pull github main
Set upstream branch to track main
git branch --set-upstream-to github/main
Push local to github main
git push github main
If you have changes in the new remote project (like a readme) that don’t exist locally yet and you get the error: “fatal: refusing to merge unrelated histories” then pull with the allow unrelated histories option:
git pull github master --allow-unrelated-histories
Now:’git push’ and you should be good.
For my local development these steps are enough for what I need, but if you have a master in your remote repo too and want to delete it there are additional steps in the article linked above.
Microsoft has open source’d GW BASIC, originally released in 1983. You can browse the source here on GitHub, but the article looking back at what was also going in in tech in 1983 is also a fascinating look back in history.
Just ran into this as I had changed my account password a few days back, and the approach to change your password for your git client on OS X is not that obvious. At the same time I enabled Two Factor Authentication for my github account. When using with a command-line git client, this also requires generating a Personal Access Token and passing it with your authentication.
Instructions in this post here – you need to change your password in the Keychain Access app.
Create a Personal Access Token following steps here.
Next, when adding a remote for the repo, pass the token like this:
git remote add github https://github-id:firstname.lastname@example.org/path-to/remote-repo.git
Now when you push to the remote repo, you’ll be authenticated with your token, and should be all set.