How to change the author and committer name and e-mail of multiple commits in Git

Question

I was writing a simple script in the school computer  and committing the changes to Git  in a repo that was in my pendrive  cloned from my computer at home   After several commits I realized I was committing stuff as the root user   Is there any way to change the author of these commits to my name

User · Answer

A safer alternative to git s filter-branch is filter-repo tool as suggested by git docs here   git filter-repo --commit-callback      old email   b your-old-email example com    correct name   b Your Correct Name    correct email   b your-correct-email example com     if commit committer email    old email       commit committer name   correct name     commit committer email   correct email    if commit author email    old email        commit author name   correct name     commit author email   correct email       The above command mirrors the logic used in this script but uses filter-repo instead of filter-branch    The code body after commit-callback option is basically python code used for processing commits  You can write your own logic in python here  See more about commit object and its attributes here    Since filter-repo tool is not bundled with git you need to install it separately    See Prerequisties and Installation Guide  If you have a python env    3 5  you can use pip to install it   pip3 install git-filter-repo   Note  It is strongly recommended to try filter-repo tool on a fresh clone  Also remotes are removed once the operation is done  Read more on why remotes are removed here  Also read the limitations of this tool under INTERNALS section

User · Answer

I adapted this solution which works by ingesting a simple author-conv-file  format is the same as one for git-cvsimport   It works by changing all users as defined in the author-conv-file across all branches    We used this in conjunction with cvs2git to migrate our repository from cvs to git   i e  Sample author-conv-file  john John Doe  lt john doe hotmail com gt  jill Jill Doe  lt jill doe hotmail com gt    The script       bin bash   export  authors file author-conv-file   git filter-branch -f --env-filter     get name           grep    1     authors file         sed  s             lt    gt    1        get email           grep    1     authors file         sed  s         lt        gt    1        GIT AUTHOR NAME   get name  GIT COMMITTER NAME   amp  amp       GIT AUTHOR EMAIL   get email  GIT COMMITTER NAME   amp  amp       GIT COMMITTER NAME  GIT AUTHOR NAME  amp  amp       GIT COMMITTER EMAIL  GIT AUTHOR EMAIL  amp  amp       export GIT AUTHOR NAME GIT AUTHOR EMAIL  amp  amp       export GIT COMMITTER NAME GIT COMMITTER EMAIL    -- --all

User · Answer

Your problem is really common  See  Using Mailmap to Fix Authors List in Git   For the sake of simplicity  I have created a script to ease the process  git-changemail  After putting that script on your path  you can issue commands like    Change author matchings on current branch    git changemail -a old email com -n newname -m new email com  Change author and committer matchings on  lt branch  and  lt branch2   Pass -f to filter-branch to allow rewriting backups    git changemail -b old email com -n newname -m new email com -- -f  amp lt branch gt   amp lt branch2 gt   Show existing users on repo    git changemail --show-both    By the way  after making your changes  clean the backup from the filter-branch with  git-backup-clean

User · Answer

This answer uses git-filter-branch  for which the docs now give this warning  git filter-branch has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite  and can leave you with little time to investigate such problems since it has such abysmal performance   These safety and performance issues cannot be backward compatibly fixed and as such  its use is not recommended  Please use an alternative history filtering tool such as git filter-repo  If you still need to use git filter-branch  please carefully read SAFETY  and PERFORMANCE  to learn about the land mines of filter-branch  and then vigilantly avoid as many of the hazards listed there as reasonably possible   Changing the author  or committer  would require re-writing all of the history   If you re okay with that and think it s worth it then you should check out git filter-branch   The man page includes several examples to get you started   Also note that you can use environment variables to change the name of the author  committer  dates  etc  -- see the  quot Environment Variables quot  section of the git man page  Specifically  you can fix all the wrong author names and emails for all branches and tags with this command  source  GitHub help      bin sh  git filter-branch --env-filter   OLD EMAIL  quot your-old-email example com quot  CORRECT NAME  quot Your Correct Name quot  CORRECT EMAIL  quot your-correct-email example com quot  if    quot  GIT COMMITTER EMAIL quot     quot  OLD EMAIL quot    then     export GIT COMMITTER NAME  quot  CORRECT NAME quot      export GIT COMMITTER EMAIL  quot  CORRECT EMAIL quot  fi if    quot  GIT AUTHOR EMAIL quot     quot  OLD EMAIL quot    then     export GIT AUTHOR NAME  quot  CORRECT NAME quot      export GIT AUTHOR EMAIL  quot  CORRECT EMAIL quot  fi   --tag-name-filter cat -- --branches --tags

User · Answer

Change commit author name  amp  email by Amend  then replacing old-commit with new-one      git checkout  lt commit-hash gt                               checkout to the commit need to modify     git commit --amend --author  name  lt author email com gt     change the author name and email    git replace  lt old-commit-hash gt   lt new-commit-hash gt         replace the old commit by new one   git filter-branch -- --all                             rewrite all futures commits based on the replacement                       git replace -d  lt old-commit-hash gt        remove the replacement for cleanliness    git push -f origin HEAD                force push   Another way Rebasing     git rebase -i  lt good-commit-hash gt         back to last good commit    Editor would open  replace  pick  with  edit  before the commit want to change author    git commit --amend --author  author name  lt author email com gt      change the author name  amp  email    Save changes and exit the editor    git rebase --continue                  finish the rebase

User · Answer

For a single commit   git commit --amend --author  Author Name  lt email address com gt      extracted from asmeurer s answer

User · Answer

NOTE  This answer changes SHA1s  so take care when using it on a branch that has already been pushed  If you only want to fix the spelling of a name or update an old email  git lets you do this without rewriting history using  mailmap  See my other answer  Using Interactive Rebase You could do git rebase -i -p  lt some HEAD before all of your bad commits gt   Then mark all of your bad commits as  quot edit quot  in the rebase file  If you also want to change your first commit  you have to manually add it as the first line in the rebase file  follow the format of the other lines   Then  when git asks you to amend each commit  do  git commit --amend --author  quot New Author Name  lt email address com gt  quot    edit or just close the editor that opens  and then do git rebase --continue  to continue the rebase  You could skip opening the editor altogether here by appending --no-edit so that the command will be  git commit --amend --author  quot New Author Name  lt email address com gt  quot  --no-edit  amp  amp    git rebase --continue  Single Commit As some of the commenters have noted  if you just want to change the most recent commit  the rebase command is not necessary  Just do  git commit --amend --author  quot New Author Name  lt email address com gt  quot   This will change the author to the name specified  but the committer will be set to your configured user in git config user name and git config user email  If you want to set the committer to something you specify  this will set both the author and the committer   git -c user name  quot New Author Name quot  -c user email email address com commit --amend --reset-author  Note on Merge Commits There was a slight flaw in my original response  If there are any merge commits between the current HEAD and your  lt some HEAD before all your bad commits gt   then git rebase will flatten them  and by the way  if you use GitHub pull requests  there are going to be a ton of merge commits in your history   This can very often lead to a very different history  as duplicate changes may be  quot rebased out quot    and in the worst case  it can lead to git rebase asking you to resolve difficult merge conflicts  which were likely already resolved in the merge commits   The solution is to use the -p flag to git rebase  which will preserve the merge structure of your history  The manpage for git rebase warns that using -p and -i can lead to issues  but in the BUGS section it says  quot Editing commits and rewording their commit messages should work fine  quot  I ve added -p to the above command  For the case where you re just changing the most recent commit  this is not an issue  Update for modern git clients  July 2020  Use --rebase-merges instead of -p  -p is deprecated and has serious issues

User · Answer

git rebase -i YOUR FIRTS COMMIT SHA   while true  do git commit --amend --author  Name Surname  lt email example com gt   --no-edit  amp  amp  git rebase --continue  done   Press  C   after the rebase is done  the loop will keep updating last commit

User · Answer

I should point out that if the only problem is that the author email is different from your usual  this is not a problem   The correct fix is to create a file called  mailmap at the base of the directory with lines like Name you want  lt email you want gt  Name you don t want  lt email you don t want gt   And from then on  commands like git shortlog will consider those two names to be the same  unless you specifically tell them not to    See http   schacon github com git git-shortlog html for more information  This has the advantage of all the other solutions here in that you don t have to rewrite history  which can cause problems if you have an upstream  and is always a good way to accidentally lose data  Of course  if you committed something as yourself and it should really be someone else  and you don t mind rewriting history at this point  changing the commit author is probably a good idea for attribution purposes  in which case I direct you to my other answer here

User · Answer

Note that git stores two different e-mail addresses  one for the committer  the person who committed the change  and another one for the author  the person who wrote the change    The committer information isn t displayed in most places  but you can see it with git log -1 --format  cn  ce  or use show instead of log to specify a particular commit    While changing the author of your last commit is as simple as git commit --amend --author  Author Name  lt email example com gt    there is no one-liner or argument to do the same to the committer information   The solution is to  temporarily  or not  change your user information  then amend the commit  which will update the committer to your current information   git config user email my other email example com  git commit --amend

User · Answer

This isn t an answer to your question  but rather a script you can use to avoid this in the future   It utilizes global hooks available since Git version 2 9 to check your email configuration based on the directory your in      bin sh PWD  pwd  if     PWD      Ippon        1  then   EMAIL   git config user email    if     EMAIL      Work        2    then     echo       else     echo  Email not configured to your Work email in the Work directory        git config user email  youremail youremail com      echo  Git email configuration has now been changed to     git config user      echo   nPlease run your command again         echo        exit 1   fi  elif     PWD      Personal      then   EMAIL   git config user email    if     EMAIL     youremail youremail com       then     echo       else     echo  Email is not configured to your personal account in the Personal di      git config user email  youremail youremail com      echo  Git email configuration has now been changed to     git config user      echo   nPlease run your command again         echo        exit 1    fi  fi     It checks your current working directory  then verifies your git is configured to the correct email   If not  it changes it automatically   See the full details here

User · Answer

One liner  but be careful if you have a multi-user repository - this will change all commits to have the same  new  author and committer   git filter-branch -f --env-filter  GIT AUTHOR NAME  Newname   GIT AUTHOR EMAIL  new email   GIT COMMITTER NAME  Newname   GIT COMMITTER EMAIL  new email    HEAD   With linebreaks in the string  which is possible in bash    git filter-branch -f --env-filter       GIT AUTHOR NAME  Newname      GIT AUTHOR EMAIL  new email      GIT COMMITTER NAME  Newname      GIT COMMITTER EMAIL  new email      HEAD

User · Answer

If you want to  easily  change the author for the current branch I would use something like this     update author for everything since origin master git rebase     -i origin master     --exec  git commit --amend --no-edit --author  Author Name  lt author name email co uk gt

User · Answer

I want to add my Example too   I want to create a bash function with given parameter   this works in mint-linux-17 3     1   gt  email to change   2   gt  new name   3   gt  new E-Mail  function git change user config for commit       defaults  WRONG EMAIL   1 - you wrong mail hello world    NEW NAME   2 - your name    NEW EMAIL   3 - new mail hello world     git filter-branch -f --env-filter     if     GIT COMMITTER EMAIL     WRONG EMAIL     then     export GIT COMMITTER NAME   NEW NAME      export GIT COMMITTER EMAIL   NEW EMAIL    fi   if     GIT AUTHOR EMAIL     WRONG EMAIL     then     export GIT AUTHOR NAME   NEW NAME      export GIT AUTHOR EMAIL   NEW EMAIL    fi    --tag-name-filter cat -- --branches --tags

User · Answer

If you are the only user of this repository  you can rewrite history using either git filter-branch  as svick wrote   or git fast-export git fast-import plus filter script  as described in article referenced in docgnome answer   or interactive rebase   But either of those would change revisions from first changed commit onwards  this means trouble for anybody that based his her changes on your branch pre-rewrite   RECOVERY   If other developers didn t based their work on pre-rewrite version  simplest solution would be to re-clone  clone again      Alternatively they can try git rebase --pull  which would fast-forward if there weren t any changes in their repository  or rebase their branch on top of re-written commits  we want to avoid merge  as it would keep pre-rewrite comits forever    All of this assuming that they do not have not comitted work  use git stash to stash away changes otherwise   If other developers use feature branches  and or git pull --rebase doesn t work e g  because upstream is not set up  they have to rebase their work on top of post-rewrite commits   For example just after fetching new changes  git fetch   for a master branch based on   forked from origin master  one needs to run    git rebase --onto origin master origin master  1  master   Here origin master  1  is pre-rewrite state  before fetch   see gitrevisions     Alternate solution would be to use refs replace  mechanism  available in Git since version 1 6 5   In this solution you provide replacements for commits that have wrong email  then anybody who fetches  replace  refs  something like fetch    refs replace   refs replace   refspec in appropriate place in their  git config  would get replacements transparently  and those who do not fetch those refs would see old commits   The procedure goes something like this    Find all commits with wrong email  for example using    git log --author user wrong email --all  For each wrong commit  create a replacement commit  and add it to object database    git cat-file -p  lt ID of wrong commit gt       sed -e  s user wrong  email user example com g   gt  tmp txt   git hash-object -t commit -w tmp txt  lt ID of corrected commit gt   Now that you have corrected commit in object database  you have to tell git to automatically and transparently replace wrong commit by corrected one using git replace command     git replace  lt ID of wrong commit gt   lt ID of corrected commit gt   Finally  list all replacement to check if this procedure succeded    git replace -l   and check if replacements take place    git log --author user wrong email --all    You can of course automate this procedure    well  all except using git replace which doesn t have  yet  batch mode  so you would have to use shell loop for that  or replace  by hand    NOT TESTED  YMMV   Note that you might encounter some rough corners when using refs replace  mechanism  it is new  and not yet very well tested

User · Answer

The fastest  easiest way to do this is to use the --exec argument of git rebase   git rebase -i -p --exec  git commit --amend --reset-author --no-edit    This will create a todo-list that looks like this   pick ef11092 Blah blah blah exec git commit --amend --reset-author --no-edit pick 52d6391 Blah bloh bloo exec git commit --amend --reset-author --no-edit pick 30ebbfe Blah bluh bleh exec git commit --amend --reset-author --no-edit       and this will work all automatically  which works when you have hundreds of commits

User · Answer

It happens when you do not have a  HOME  gitconfig initialized  You may fix this as   git config --global user name  you name  git config --global user email you domain com git commit --amend --reset-author   tested with git version 1 7 5 4

User · Answer

If you are using Eclipse with EGit  then there is a quite easy solution  Assumption  you have commits in a local branch  local master user x  which cannot be pushed to a remote branch  master  because of the invalid user    Checkout the remote branch  master  Select the projects folders files for which  local master user x  contains changes Right-click - Replace with - Branch -  local master user x  Commit these changes again  this time as the correct user and into the local branch  master  Push to remote  master

User · Answer

In the case where just the top few commits have bad authors  you can do this all inside git rebase -i using the exec command and the --amend commit  as follows   git rebase -i HEAD 6   as required   which presents you with the editable list of commits   pick abcd Someone else s commit pick defg my bad commit 1 pick 1234 my bad commit 2   Then add exec     --author       lines after all lines with bad authors   pick abcd Someone else s commit pick defg my bad commit 1 exec git commit --amend --author  New Author Name  lt email address com gt   -C HEAD pick 1234 my bad commit 2 exec git commit --amend --author  New Author Name  lt email address com gt   -C HEAD   save and exit editor  to run    This solution may be longer to type than some others  but it s highly controllable - I know exactly what commits it hits   Thanks to  asmeurer for the inspiration

User · Answer

Using interactive rebase  you can place an amend command after each commit you want to alter  For instance   pick a07cb86 Project tile template with full details and styling x git commit --amend --reset-author -Chead

User · Answer

If the commits you want to fix are the latest ones  and just a couple of them  you can use a combination of git reset and git stash to go back an commit them again after configuring the right name and email   The sequence will be something like this  for 2 wrong commits  no pending changes    git config user name  lt good name gt  git config user email  lt good email gt  git reset HEAD  git stash git reset HEAD  git commit -a git stash pop git commit -a

User · Answer

All the answers above rewrite the history of the repository  As long as the name to change has not been used by multiple authors and especially if the repository has been shared and the commit is old I d prefer to use  mailmap  documented at https   git-scm com docs git-shortlog  It allows mapping incorrect names emails to the correct one without modifying the repo history  You can use lines like   Proper Name  lt proper email xx gt   lt root localhost gt

User · Answer

A single command to change the author for the last N commits  git rebase -i HEAD 4 -x  quot git commit --amend --author  Author Name  lt author name mail com gt   --no-edit quot   NOTES  the --no-edit flag makes sure the git commit --amend doesn t ask an extra confirmation when you use git rebase -i  you can manually select the commits where to change the author   the file you edit will look like this  pick 897fe9e simplify code a little exec git commit --amend --author  Author Name  lt author name mail com gt   --no-edit pick abb60f9 add new feature exec git commit --amend --author  Author Name  lt author name mail com gt   --no-edit pick dc18f70 bugfix exec git commit --amend --author  Author Name  lt author name mail com gt   --no-edit  You can then still modify some lines to see where you want to change the author  This gives you a nice middle ground between automation and control  you see the steps that will run  and once you save everything will be applied at once

User · Answer

For those under windows  you could also use the git-rocket-filter tool   From the documentation   Change commit author name and email   git-rocket-filter --branch TestBranch --commit-filter       if  commit AuthorName Contains  Jim                 commit AuthorName    Paul            commit AuthorEmail    paul company com

User · Answer

You can also do   git filter-branch --commit-filter           if     GIT COMMITTER NAME      lt Old Name gt              then                 GIT COMMITTER NAME   lt New Name gt                    GIT AUTHOR NAME   lt New Name gt                    GIT COMMITTER EMAIL   lt New Email gt                    GIT AUTHOR EMAIL   lt New Email gt                    git commit-tree               else                 git commit-tree               fi  HEAD   Note  if you are using this command in the Windows command prompt  then you need to use   instead of     git filter-branch --commit-filter           if     GIT COMMITTER NAME      lt Old Name gt              then                 GIT COMMITTER NAME   lt New Name gt                    GIT AUTHOR NAME   lt New Name gt                    GIT COMMITTER EMAIL   lt New Email gt                    GIT AUTHOR EMAIL   lt New Email gt                    git commit-tree               else                 git commit-tree               fi  HEAD

User · Answer

I found the presented versions way to aggressive  especially if you commit patches from other developers  this will essentially steal their code   The version below does work on all branches and changes the author and comitter separately to prevent that   Kudos to leif81 for the all option      bin bash  git filter-branch --env-filter   if     GIT AUTHOR NAME      lt old author gt      then     GIT AUTHOR NAME   lt new author gt        GIT AUTHOR EMAIL   lt youmail somehost ext gt    fi if     GIT COMMITTER NAME      lt old committer gt      then     GIT COMMITTER NAME   lt new commiter gt        GIT COMMITTER EMAIL   lt youmail somehost ext gt    fi   -- --all

User · Answer

I use the following to rewrite the author for an entire repository  including tags and all branches   git filter-branch --tag-name-filter cat --env-filter     export GIT AUTHOR NAME  New name     export GIT AUTHOR EMAIL  New email    -- --all   Then  as described in the MAN page of filter-branch  remove all original refs backed up by filter-branch  this is destructive  backup first    git for-each-ref --format    refname   refs original      xargs -n 1 git update-ref -d

User · Answer

As docgnome mentioned  rewriting history is dangerous and will break other people s repositories   But if you really want to do that and you are in a bash environment  no problem in Linux  on Windows  you can use git bash  that is provided with the installation of git   use git filter-branch   git filter-branch --env-filter     if    GIT AUTHOR EMAIL   bad email        then GIT AUTHOR EMAIL correct email    fi  export GIT AUTHOR EMAIL    To speed things up  you can specify a range of revisions you want to rewrite   git filter-branch --env-filter     if    GIT AUTHOR EMAIL   bad email        then GIT AUTHOR EMAIL correct email    fi  export GIT AUTHOR EMAIL  HEAD 20  HEAD

User · Answer

We have experienced an issue today where a UTF8 character in an author name was causing trouble on the build server  so we had to rewrite the history to correct this  The steps taken were   Step 1  Change your username in git for all future commits  as per instructions here  https   help github com articles setting-your-username-in-git   Step 2  Run the following bash script      bin sh  REPO URL ssh   path to your git REPO DIR rewrite tmp    Clone the repository git clone   REPO URL    REPO DIR     Change to the cloned repository cd   REPO DIR     Checkout all the remote branches as local tracking branches git branch --list -r origin     cut -c10-   xargs -n1 git checkout    Rewrite the history  use a system that will preseve the eol  or lack of in commit messages  - preferably Linux not OSX git filter-branch --env-filter   OLD EMAIL  me something com  CORRECT NAME  New Me   if     GIT COMMITTER EMAIL      OLD EMAIL    then     export GIT COMMITTER NAME   CORRECT NAME  fi if     GIT AUTHOR EMAIL      OLD EMAIL    then     export GIT AUTHOR NAME   CORRECT NAME  fi   --tag-name-filter cat -- --branches --tags    Force push the rewritten branches   tags to the remote git push -f    Remove all knowledge that we did something rm -rf   REPO DIR     Tell your colleagues to  git pull --rebase  on all their local remote tracking branches   Quick overview  Checkout your repository to a temp file  checkout all the remote branches  run the script which will rewrite the history  do a force push of the new state  and tell all your colleagues to do a rebase pull to get the changes   We had trouble with running this on OS X because it somehow messed up line endings in commit messages  so we had to re-run it on a Linux machine afterwards

User · Answer

run git rebase -i  lt sha1 or ref of starting point gt   mark all commits that you want to change with edit  or e   loop the following two commands until you have processed all the commits  git commit --amend --reuse-message HEAD --author  quot New Author  lt new author email gt  quot    git rebase --continue   This will keep all the other commit information  including the dates   The --reuse-message HEAD option prevents the message editor from launching

User · Answer

If you are the only user of this repo or you don t care about possibly breaking the repo for other users  then yes  If you ve pushed these commits and they exist where somewhere else can access them  then no  unless you don t care about breaking other people s repos  The problem is by changing these commits you will be generating new SHAs which will cause them to be treated as different commits  When someone else tries to pull in these changed commits  the history is different and kaboom   This page http   inputvalidation blogspot com 2008 08 how-to-change-git-commit-author html describes how to do it   I haven t tried this so YMMV

User · Answer

Github has a nice solution  which is the following shell script      bin sh  git filter-branch --env-filter    an   GIT AUTHOR NAME  am   GIT AUTHOR EMAIL  cn   GIT COMMITTER NAME  cm   GIT COMMITTER EMAIL   if     GIT COMMITTER EMAIL     your email to match    then     cn  Your New Committer Name      cm  Your New Committer Email  fi if     GIT AUTHOR EMAIL     your email to match    then     an  Your New Author Name      am  Your New Author Email  fi  export GIT AUTHOR NAME   an  export GIT AUTHOR EMAIL   am  export GIT COMMITTER NAME   cn  export GIT COMMITTER EMAIL   cm

User · Answer

You can use this as a alias so you can do   git change-commits GIT AUTHOR NAME  old name   new name    or for the last 10 commits   git change-commits GIT AUTHOR EMAIL  old email com   new email com  HEAD 10  HEAD   Add to    gitconfig    alias      change-commits     f     VAR  1  OLD  2  NEW  3  shift 3  git filter-branch --env-filter   if          echo  VAR          OLD      then export  VAR   NEW   fi          f     Source  https   github com brauliobo gitconfig blob master configs  gitconfig  Hope it is useful

User · Answer

This is a more elaborated version of  Brian s version   To change the author and committer  you can do this  with linebreaks in the string which is possible in bash    git filter-branch --env-filter       if     GIT COMMITTER NAME      lt Old name gt          then         GIT COMMITTER NAME   lt New name gt            GIT COMMITTER EMAIL   lt New email gt            GIT AUTHOR NAME   lt New name gt            GIT AUTHOR EMAIL   lt New email gt        fi  -- --all   You might get one of these errors    The temporary directory exists already Refs starting with refs original exists already  this means another filter-branch has been run previously on the repository and the then original branch reference is backed up at refs original    If you want to force the run in spite of these errors  add the --force flag   git filter-branch --force --env-filter       if     GIT COMMITTER NAME      lt Old name gt          then         GIT COMMITTER NAME   lt New name gt            GIT COMMITTER EMAIL   lt New email gt            GIT AUTHOR NAME   lt New name gt            GIT AUTHOR EMAIL   lt New email gt        fi  -- --all   A little explanation of the -- --all option might be needed  It makes the filter-branch work on all revisions on all refs  which includes all branches   This means  for example  that tags are also rewritten and is visible on the rewritten branches   A common  mistake  is to use HEAD instead  which means filtering all revisions on just the current branch  And then no tags  or other refs  would exist in the rewritten branch

User · Answer

I would like to contribute with a modification of  Rognon answer  This answer is just another alternative in case the selected answer or others don t work for you  in my particular issue that was the case    Objective  You will fix one or more authors with a correct one in the ALL the history  and you will get a clean history without duplicates  This method works by replacing  master  branch with a  clean  branch  its not using merge rebase   NOTE  Anyone using the  master  repository may need to checkout it again  after performing these steps  before pushing  as merge may fail   We will use a new branch named  clean  to perform the operations  assuming you want to fix  master     git checkout -b clean   be sure you are in the  clean  branch  git branch   Modify the following script  replacing the email addresses and names   Note that this script expects two wrong emails authors  as example   so if you only need to fix a single author  you can remove the second part of the condition or leave it like that  as it will be ignored as it won t match    Execute the script     bin bash  git filter-branch --force --commit-filter           if     GIT COMMITTER EMAIL     wrong1 example com  -o   GIT COMMITTER EMAIL     wrong2 example com             then                 export GIT COMMITTER NAME  John Doe                   export GIT AUTHOR NAME  John Doe                   export GIT COMMITTER EMAIL  correct example com                   export GIT AUTHOR EMAIL  correct example com           fi          git commit-tree        --tag-name-filter cat -- --all   It has to report  Ref  refs heads clean  was rewritten  If it reports  unchanged   maybe the email s  entered in the script is wrong   Confirm the history has been corrected with  git log  If you are using github gitlab  recommended   safe     create the  clean  branch in remote     git push --set-upstream origin clean   set  clean  branch as default branch remove  master   be sure everything is as expected before doing this    Create a new branch  master  based in  clean  branch   After confirming all is good  you can remove  clean  branch now  alternative you can just rename it     If are not using github gitlab or you prefer doing it by command    Delete the master branch from local     git branch -d master   Rename the branch    git branch -m clean master   Push it  be sure you  master  is unprotected    git push --force origin master

User · Answer

Try this out  It will do the same as above mentioned  but interactively   bash  lt  curl -s  https   raw githubusercontent com majdarbash git-author-change-script master run sh    Reference  https   github com majdarbash git-author-change-script

User · Answer

When taking over an unmerged commit from another author  there is an easy way to handle this   git commit --amend --reset-author

[git] How to change the author and committer name and e-mail of multiple commits in Git?

Examples related to git

Examples related to version-control

Examples related to git-filter-branch

Examples related to git-rewrite-history