I have a repository on bitbucket which is aligned with the online repository (origin), while using Atlassian Sourcetree as tool for managing it.
Let's say it has 20 commits.
Sourcetree for some reason haves its share of fun changing project settings and I wrongly pushed 2 commits (let's say commit 15 and 16 as some other coworker which uses the machine too.
I want to put my name and mail in those commits.
Let's imagine the tree like this (without branches, just master)
Commit number -> comment -> commit id -> author/mail
someone [email protected] should become me.
I'm admin on the repo.
How to do it in a simple way? It's possible from Sourcetree? Should I do it from the terminal?
Could it be a workable solution to manually modify files in the .git folder and create a new repo and commit there?
Question is not duplicate as suggeste duplicate answers does not work well.
EDIT - CORRECT PROCEDURE FOR ANYONE LOOKING HOW TO DO IT WITHOUT TOO MUCH RESEARCH
Since everyone is marking this as duplicate while is not, as other procedures are INCOMPLETE and leave someone (like me) who is not very cool with git with problems and questions, the correct procedure is:
From SourceTree, launch terminal with the terminal button on top right when the repo is open.
Then paste this and execute, with the substitutions suitable for your case
#!/bin/sh
git filter-branch --env-filter '
OLD_EMAIL="[email protected]"
CORRECT_NAME="Your Correct Name"
CORRECT_EMAIL="[email protected]"
if [ "$GIT_COMMITTER_EMAIL" = "$OLD_EMAIL" ]
then
export GIT_COMMITTER_NAME="$CORRECT_NAME"
export GIT_COMMITTER_EMAIL="$CORRECT_EMAIL"
fi
if [ "$GIT_AUTHOR_EMAIL" = "$OLD_EMAIL" ]
then
export GIT_AUTHOR_NAME="$CORRECT_NAME"
export GIT_AUTHOR_EMAIL="$CORRECT_EMAIL"
fi
' --tag-name-filter cat -- --branches --tags
This though, will produce a secondary "backup" branch, because when rewriting history, which left me with much doubts.
I had to do this additional step to remove the "backup" branch and actually push the new history to the repo and find the new history with correct name/mail:
git push --force --tags origin 'refs/heads/*'
Here the full guide.
Thanks to everyone who pointed me to the right direction.
See Question&Answers more detail:
os