Как изменить автора коммита github

Interactive rebase off of a point earlier in the history than the commit you need to modify (git rebase -i <earliercommit>). In the list of commits being rebased, change the text from pick to edit next to the hash of the one you want to modify. Then when git prompts you to change the commit, use this:

git commit --amend --author="Author Name <email@address.com>" --no-edit

For example, if your commit history is A-B-C-D-E-F with F as HEAD, and you want to change the author of C and D, then you would…

1. Specify git rebase -i B (here is an example of what you will see after executing the git rebase -i B command)
   • if you need to edit A, use git rebase -i --root
2. Change the lines for both C and D from pick to edit
3. Exit the editor (for vim, this would be pressing Esc and then typing :wq).
4. Once the rebase started, it would first pause at C
5. You would git commit --amend --author="Author Name <email@address.com>"
6. Then git rebase --continue
7. It would pause again at D
8. Then you would git commit --amend --author="Author Name <email@address.com>" again
9. git rebase --continue
10. The rebase would complete.
11. Use git push -f to update your origin with the updated commits.

answered Jun 15, 2010 at 4:31

The accepted answer to this question is a wonderfully clever use of interactive rebase, but it unfortunately exhibits conflicts if the commit we are trying to change the author of used to be on a branch which was subsequently merged in. More generally, it does not work when handling messy histories.

Since I am apprehensive about running scripts which depend on setting and unsetting environment variables to rewrite git history, I am writing a new answer based on this post which is similar to this answer but is more complete.

The following is tested and working, unlike the linked answer.
Assume for clarity of exposition that 03f482d6 is the commit whose author we are trying to replace, and 42627abe is the commit with the new author.

1. Checkout the commit we are trying to modify.

    git checkout 03f482d6
   

2. Make the author change.

    git commit --amend --author "New Author Name <New Author Email>"
   

Now we have a new commit with hash assumed to be 42627abe.

1. Checkout the original branch.

2. Replace the old commit with the new one locally.

    git replace 03f482d6 42627abe
   

3. Rewrite all future commits based on the replacement.

    git filter-branch -- --all
   

4. Remove the replacement for cleanliness.

    git replace -d 03f482d6
   

5. Push the new history (only use —force if the below fails, and only after sanity checking with git log and/or git diff).

    git push --force-with-lease
   

Instead of 4-5 you can just rebase onto new commit:

git rebase -i 42627abe

answered Mar 4, 2015 at 2:11

Github documentation contains a script that replaces the committer info for all commits in a branch (now irretrievable, this is the last snapshot).

Run the following script from terminal after changing the variable values

#!/bin/sh
 
git filter-branch --env-filter '
 
OLD_EMAIL="your-old-email@example.com"
CORRECT_NAME="Your Correct Name"
CORRECT_EMAIL="your-correct-email@example.com"

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

Push the corrected history to GitHub:

git push --force --tags origin 'refs/heads/*'

OR if you like to push selected references of the branches then use

git push --force --tags origin 'refs/heads/develop'

If you just want to change the author of your last commit, you can do this:

• Reset your email to the config globally:

  git config --global user.email example@email.com

• Now reset the author of your commit without edit required:

  git commit --amend --reset-author --no-edit

Note this will also change the author timestamp.

You can change author of last commit using the command below.

git commit --amend --author="Author Name <email@address.com>"

However, if you want to change more than one commits author name, it’s a bit tricky. You need to start an interactive rebase then mark commits as edit then amend them one by one and finish.

Start rebasing with git rebase -i. It will show you something like this.

Change the pick keyword to edit for the commits you want to change the author name.

Then close the editor. For the beginners, hit Escape then type :wq and hit Enter.

Then you will see your terminal like nothing happened. Actually you are in the middle of an interactive rebase. Now it’s time to amend your commit’s author name using the command above. It will open the editor again. Quit and continue rebase with git rebase --continue. Repeat the same for the commit count you want to edit. You can make sure that interactive rebase finished when you get the No rebase in progress? message.

The answers in the question to which you linked are good answers and cover your situation (the other question is more general since it involves rewriting multiple commits).

As an excuse to try out git filter-branch, I wrote a script to rewrite the Author Name and/or Author Email for a given commit:

#!/bin/sh

#
# Change the author name and/or email of a single commit.
#
# change-author [-f] commit-to-change [branch-to-rewrite [new-name [new-email]]]
#
#     If -f is supplied it is passed to "git filter-branch".
#
#     If <branch-to-rewrite> is not provided or is empty HEAD will be used.
#     Use "--all" or a space separated list (e.g. "master next") to rewrite
#     multiple branches.
#
#     If <new-name> (or <new-email>) is not provided or is empty, the normal
#     user.name (user.email) Git configuration value will be used.
#

force=''
if test "x$1" = "x-f"; then
    force='-f'
    shift
fi

die() {
    printf '%sn' "$@"
    exit 128
}
targ="$(git rev-parse --verify "$1" 2>/dev/null)" || die "$1 is not a commit"
br="${2:-HEAD}"

TARG_COMMIT="$targ"
TARG_NAME="${3-}"
TARG_EMAIL="${4-}"
export TARG_COMMIT TARG_NAME TARG_EMAIL

filt='

    if test "$GIT_COMMIT" = "$TARG_COMMIT"; then
        if test -n "$TARG_EMAIL"; then
            GIT_AUTHOR_EMAIL="$TARG_EMAIL"
            export GIT_AUTHOR_EMAIL
        else
            unset GIT_AUTHOR_EMAIL
        fi
        if test -n "$TARG_NAME"; then
            GIT_AUTHOR_NAME="$TARG_NAME"
            export GIT_AUTHOR_NAME
        else
            unset GIT_AUTHOR_NAME
        fi
    fi

'

git filter-branch $force --env-filter "$filt" -- $br

answered Jun 15, 2010 at 5:24

Find a way that can change user quickly and has no side effect to others commits.

Simple and clear way:

git config user.name "New User"
git config user.email "newuser@gmail.com"

git log
git rebase -i 1f1357
# change the word 'pick' to 'edit', save and exit

git commit --amend --reset-author --no-edit
git rebase --continue

git push --force-with-lease

detailed operations

• show commit logs and find out the commit id that ahead of your commit which you want to change:

git log

• git rebase start from the chosed commit id to the recent reversely:

git config user.name "New User"
git config user.email "newuser@gmail.com"
git rebase -i 1f1357

# change word pick to edit, save and exit
edit 809b8f7 change code order 
pick 9baaae5 add prometheus monitor kubernetes
edit 5d726c3 fix liquid escape issue   
edit 3a5f98f update tags
pick 816e21c add prometheus monitor kubernetes

• rebase will Stopped at next commit id, output:

Stopped at 809b8f7...  change code order 
You can amend the commit now, with
  git commit --amend 

Once you are satisfied with your changes, run

  git rebase --continue

• comfirm and continue your rebase untill it successfully to refs/heads/master.

# each continue will show you an amend message
# use git commit --amend --reset-author --no-edit to comfirm
# use git rebase --skip to skip
git commit --amend --reset-author --no-edit
git rebase --continue
git commit --amend --reset-author --no-edit
...
git rebase --continue
Successfully rebased and updated refs/heads/master.

• git push to update

git push --force-with-lease

answered Feb 13, 2020 at 7:48

Commit before:

To fix author for all commits you can apply command from @Amber’s answer:

git commit --amend --author="Author Name <email@address.com>"

Or to reuse your name and email you can just write:

git commit --amend --author=Eugen

Commit after the command:

For example to change all starting from 4025621:

You must run:

git rebase --onto 4025621 --exec "git commit --amend --author=Eugen" 4025621

Note: To include an author containing spaces such as a name and email address, the author must be surrounded by escaped quotes. For example:

git rebase --onto 4025621 --exec "git commit --amend --author="Foo Bar <foo@bar.com>"" 4025621

or add this alias into ~/.gitconfig:

[alias]
    reauthor = !bash -c 'git rebase --onto $1 --exec "git commit --amend --author=$2" $1' --

And then run:

git reauthor 4025621 Eugen

In furtherance to Eugen Konkov answer, to start from the root commit, use --root flag. The --no-edit flag is helpful too, because with it you are not prompted into an editor for each commit.

git rebase --root --exec "git commit --amend --author='name <email>' --no-edit"

My 2019’s comment converted into an answer:

To fix authoring on the last six commits

1. First set the correct author for current Git repo

   git config --local user.name "FirstName LastName"
   git config --local user.email first.last@example.com
   

2. Then apply the fix to the last six commits

   git rebase --onto HEAD~6 --exec "git commit --amend --reset-author --no-edit" HEAD~6
   

3. Finally force push to the remote Git repo

   git push --force-with-lease
   

When doing git rebase -i there is this interesting bit in the doc:

If you want to fold two or more commits into one, replace the command "pick" for the second and subsequent commits with "squash" or "fixup". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the "squash" command, but omits the commit messages of commits with the "fixup" command.

• If you have an history of A-B-C-D-E-F,
• and you want to change commits B and D (= 2 commits),

then you can do:

• git config user.name "Correct new name"
• git config user.email "correct@new.email"
• create empty commits (one for each commit):
  • you need a message for rebase purpose
  • git commit --allow-empty -m "empty"
• start the rebase operation
  • git rebase -i B^
  • B^ selects the parent of B.
• you will want to put one empty commit before each commit to modify
• you will want to change pick to squash for those.

Example of what git rebase -i B^ will give you:

pick sha-commit-B some message
pick sha-commit-C some message
pick sha-commit-D some message
pick sha-commit-E some message
pick sha-commit-F some message
# pick sha-commit-empty1 empty
# pick sha-commit-empty2 empty

change that to:

# change commit B's author
pick sha-commit-empty1 empty
squash sha-commit-B some message
# leave commit C alone
pick sha-commit-C some message
# change commit D's author
pick sha-commit-empty2 empty
squash sha-commit-D some message
# leave commit E-F alone
pick sha-commit-E some message
pick sha-commit-F some message

It will prompt you to edit the messages:

# This is a combination of 2 commits.
# The first commit's message is:

empty

# This is the 2nd commit message:

...some useful commit message there...

and you can just remove the first few lines.

answered Aug 28, 2013 at 1:03

There is one additional step to Amber’s answer if you’re using a centralized repository:

git push -f to force the update of the central repository.

Be careful that there are not a lot of people working on the same branch because it can ruin consistency.

If the commit that you want to change is not the last commit, then follow the below steps. If your commit is in different branch then first switch to that branch.

git checkout branch_name

Find commit before the commit that you want to change and find its hash. Then issue rebase command.

git rebase -i -p hash of commit

Then an editor will open and enter ‘edit’ for the commits that you want to change. Leave others with default ‘pick’ option. Once changed enter ‘esc’ key and wq! to exit.

Then issue git commit command with amendment option.

git commit —amend —author=»Username email» —no-edit

Then issue the following command.

git rebase —continue

Once commit author is updated in the local repository, push the changes to the remote repository.

answered Jun 26, 2019 at 5:49

For the merge commit message, I found that I cannot amend it by using rebase, at least on gitlab. It shows the merge as a commit but I cannot rebase onto that #sha. I found this post is helpful.

git checkout <sha of merge>
git commit --amend # edit message
git rebase HEAD previous_branch

This three lines of code did the job for changing the merge commit message (like author).

answered Oct 1, 2019 at 22:33

SOLUTION

1. Install git filter-repo (Git project recommends filter-repo over filter-branch)

   $ PACKAGE_TOOL install git-filter-repo
   

2. Create a file .mailmap in the root of the git repository containing

   New Name <new@ema.il> <old@ema.il>
   

3. Run git filter-repo --use-mailmap

MORE DETAILS

• git-filter-repo lists this as an example in their docs
• Instead of replacing both the name and the email like in the example above, take a look at additional examples in git mailmap documentation
• Instead of using a file named .mailmap by default, you can specify mailmap file by invoking git filter-repo with argument --mailmap <filename>.
• Many more examples on how to further filter branch/tag/whatever can be found in the git-filter-repo project’s README.md.

answered Jan 12, 2021 at 14:17

OPTIONAL: Make sure to stash your local changes if you don’t want to send them to remote.

$ git status
$ git stash

Update the author for the last commit.

$ git log   // Old author in local and remote
$ git commit --amend --author="Author Name <email@address.com>"
$ git log   // New Author in local
$ git push origin <branch> --force-with-lease 
$ git log   // New Author in remote

Then, if you used git stash then recovers your staged changes

$ git stash pop
$ git status

Then, you should to update the configuration for the next commits of the current project.

$ git config user.name "Author Name"
$ git config user.email "<email@address.com>"

And check or also edit this with git config --edit

Clarification: In the rare case that you lose commits using $ ggpush -f you can recover them with reflog. Anyway using --force-with-lease you are protected even more than if you use only -f

GL

• Source
• ZSH

answered Jul 31, 2020 at 17:19

endoramaendorama

4517 silver badges15 bronze badges

Mudassir KhanMudassir Khan

1,6941 gold badge19 silver badges25 bronze badges

alexlzalexlz

6081 gold badge9 silver badges24 bronze badges

As an addition to Eugen Konkov’s answer, it is possible to keep the commit/author date. To only modify the author but not the date of the last three commits use

git rebase --onto HEAD~3 --exec 'GIT_COMMITTER_DATE="$(git log -n 1 --format=%aD)" git commit --amend --reset-author --no-edit --date="$(git log -n 1 --format=%aD)"' HEAD~3

then apply a force push

git push --force-with-lease

answered May 30, 2022 at 7:24

AmerllicAAmerllicA

26.7k14 gold badges125 silver badges148 bronze badges

answered Mar 26, 2019 at 17:34

Interactive rebase off of a point earlier in the history than the commit you need to modify (git rebase -i <earliercommit>). In the list of commits being rebased, change the text from pick to edit next to the hash of the one you want to modify. Then when git prompts you to change the commit, use this:

git commit --amend --author="Author Name <email@address.com>" --no-edit

For example, if your commit history is A-B-C-D-E-F with F as HEAD, and you want to change the author of C and D, then you would…

1. Specify git rebase -i B (here is an example of what you will see after executing the git rebase -i B command)
   • if you need to edit A, use git rebase -i --root
2. Change the lines for both C and D from pick to edit
3. Exit the editor (for vim, this would be pressing Esc and then typing :wq).
4. Once the rebase started, it would first pause at C
5. You would git commit --amend --author="Author Name <email@address.com>"
6. Then git rebase --continue
7. It would pause again at D
8. Then you would git commit --amend --author="Author Name <email@address.com>" again
9. git rebase --continue
10. The rebase would complete.
11. Use git push -f to update your origin with the updated commits.

answered Jun 15, 2010 at 4:31

The accepted answer to this question is a wonderfully clever use of interactive rebase, but it unfortunately exhibits conflicts if the commit we are trying to change the author of used to be on a branch which was subsequently merged in. More generally, it does not work when handling messy histories.

Since I am apprehensive about running scripts which depend on setting and unsetting environment variables to rewrite git history, I am writing a new answer based on this post which is similar to this answer but is more complete.

The following is tested and working, unlike the linked answer.
Assume for clarity of exposition that 03f482d6 is the commit whose author we are trying to replace, and 42627abe is the commit with the new author.

1. Checkout the commit we are trying to modify.

    git checkout 03f482d6
   

2. Make the author change.

    git commit --amend --author "New Author Name <New Author Email>"
   

Now we have a new commit with hash assumed to be 42627abe.

1. Checkout the original branch.

2. Replace the old commit with the new one locally.

    git replace 03f482d6 42627abe
   

3. Rewrite all future commits based on the replacement.

    git filter-branch -- --all
   

4. Remove the replacement for cleanliness.

    git replace -d 03f482d6
   

5. Push the new history (only use —force if the below fails, and only after sanity checking with git log and/or git diff).

    git push --force-with-lease
   

Instead of 4-5 you can just rebase onto new commit:

git rebase -i 42627abe

answered Mar 4, 2015 at 2:11

Github documentation contains a script that replaces the committer info for all commits in a branch (now irretrievable, this is the last snapshot).

Run the following script from terminal after changing the variable values

#!/bin/sh
 
git filter-branch --env-filter '
 
OLD_EMAIL="your-old-email@example.com"
CORRECT_NAME="Your Correct Name"
CORRECT_EMAIL="your-correct-email@example.com"

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

Push the corrected history to GitHub:

git push --force --tags origin 'refs/heads/*'

OR if you like to push selected references of the branches then use

git push --force --tags origin 'refs/heads/develop'

If you just want to change the author of your last commit, you can do this:

• Reset your email to the config globally:

  git config --global user.email example@email.com

• Now reset the author of your commit without edit required:

  git commit --amend --reset-author --no-edit

Note this will also change the author timestamp.

You can change author of last commit using the command below.

git commit --amend --author="Author Name <email@address.com>"

However, if you want to change more than one commits author name, it’s a bit tricky. You need to start an interactive rebase then mark commits as edit then amend them one by one and finish.

Start rebasing with git rebase -i. It will show you something like this.

Change the pick keyword to edit for the commits you want to change the author name.

Then close the editor. For the beginners, hit Escape then type :wq and hit Enter.

Then you will see your terminal like nothing happened. Actually you are in the middle of an interactive rebase. Now it’s time to amend your commit’s author name using the command above. It will open the editor again. Quit and continue rebase with git rebase --continue. Repeat the same for the commit count you want to edit. You can make sure that interactive rebase finished when you get the No rebase in progress? message.

The answers in the question to which you linked are good answers and cover your situation (the other question is more general since it involves rewriting multiple commits).

As an excuse to try out git filter-branch, I wrote a script to rewrite the Author Name and/or Author Email for a given commit:

#!/bin/sh

#
# Change the author name and/or email of a single commit.
#
# change-author [-f] commit-to-change [branch-to-rewrite [new-name [new-email]]]
#
#     If -f is supplied it is passed to "git filter-branch".
#
#     If <branch-to-rewrite> is not provided or is empty HEAD will be used.
#     Use "--all" or a space separated list (e.g. "master next") to rewrite
#     multiple branches.
#
#     If <new-name> (or <new-email>) is not provided or is empty, the normal
#     user.name (user.email) Git configuration value will be used.
#

force=''
if test "x$1" = "x-f"; then
    force='-f'
    shift
fi

die() {
    printf '%sn' "$@"
    exit 128
}
targ="$(git rev-parse --verify "$1" 2>/dev/null)" || die "$1 is not a commit"
br="${2:-HEAD}"

TARG_COMMIT="$targ"
TARG_NAME="${3-}"
TARG_EMAIL="${4-}"
export TARG_COMMIT TARG_NAME TARG_EMAIL

filt='

    if test "$GIT_COMMIT" = "$TARG_COMMIT"; then
        if test -n "$TARG_EMAIL"; then
            GIT_AUTHOR_EMAIL="$TARG_EMAIL"
            export GIT_AUTHOR_EMAIL
        else
            unset GIT_AUTHOR_EMAIL
        fi
        if test -n "$TARG_NAME"; then
            GIT_AUTHOR_NAME="$TARG_NAME"
            export GIT_AUTHOR_NAME
        else
            unset GIT_AUTHOR_NAME
        fi
    fi

'

git filter-branch $force --env-filter "$filt" -- $br

answered Jun 15, 2010 at 5:24

Find a way that can change user quickly and has no side effect to others commits.

Simple and clear way:

git config user.name "New User"
git config user.email "newuser@gmail.com"

git log
git rebase -i 1f1357
# change the word 'pick' to 'edit', save and exit

git commit --amend --reset-author --no-edit
git rebase --continue

git push --force-with-lease

detailed operations

• show commit logs and find out the commit id that ahead of your commit which you want to change:

git log

• git rebase start from the chosed commit id to the recent reversely:

git config user.name "New User"
git config user.email "newuser@gmail.com"
git rebase -i 1f1357

# change word pick to edit, save and exit
edit 809b8f7 change code order 
pick 9baaae5 add prometheus monitor kubernetes
edit 5d726c3 fix liquid escape issue   
edit 3a5f98f update tags
pick 816e21c add prometheus monitor kubernetes

• rebase will Stopped at next commit id, output:

Stopped at 809b8f7...  change code order 
You can amend the commit now, with
  git commit --amend 

Once you are satisfied with your changes, run

  git rebase --continue

• comfirm and continue your rebase untill it successfully to refs/heads/master.

# each continue will show you an amend message
# use git commit --amend --reset-author --no-edit to comfirm
# use git rebase --skip to skip
git commit --amend --reset-author --no-edit
git rebase --continue
git commit --amend --reset-author --no-edit
...
git rebase --continue
Successfully rebased and updated refs/heads/master.

• git push to update

git push --force-with-lease

answered Feb 13, 2020 at 7:48

Commit before:

To fix author for all commits you can apply command from @Amber’s answer:

git commit --amend --author="Author Name <email@address.com>"

Or to reuse your name and email you can just write:

git commit --amend --author=Eugen

Commit after the command:

For example to change all starting from 4025621:

You must run:

git rebase --onto 4025621 --exec "git commit --amend --author=Eugen" 4025621

Note: To include an author containing spaces such as a name and email address, the author must be surrounded by escaped quotes. For example:

git rebase --onto 4025621 --exec "git commit --amend --author="Foo Bar <foo@bar.com>"" 4025621

or add this alias into ~/.gitconfig:

[alias]
    reauthor = !bash -c 'git rebase --onto $1 --exec "git commit --amend --author=$2" $1' --

And then run:

git reauthor 4025621 Eugen

In furtherance to Eugen Konkov answer, to start from the root commit, use --root flag. The --no-edit flag is helpful too, because with it you are not prompted into an editor for each commit.

git rebase --root --exec "git commit --amend --author='name <email>' --no-edit"

My 2019’s comment converted into an answer:

To fix authoring on the last six commits

1. First set the correct author for current Git repo

   git config --local user.name "FirstName LastName"
   git config --local user.email first.last@example.com
   

2. Then apply the fix to the last six commits

   git rebase --onto HEAD~6 --exec "git commit --amend --reset-author --no-edit" HEAD~6
   

3. Finally force push to the remote Git repo

   git push --force-with-lease
   

When doing git rebase -i there is this interesting bit in the doc:

If you want to fold two or more commits into one, replace the command "pick" for the second and subsequent commits with "squash" or "fixup". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the "squash" command, but omits the commit messages of commits with the "fixup" command.

• If you have an history of A-B-C-D-E-F,
• and you want to change commits B and D (= 2 commits),

then you can do:

• git config user.name "Correct new name"
• git config user.email "correct@new.email"
• create empty commits (one for each commit):
  • you need a message for rebase purpose
  • git commit --allow-empty -m "empty"
• start the rebase operation
  • git rebase -i B^
  • B^ selects the parent of B.
• you will want to put one empty commit before each commit to modify
• you will want to change pick to squash for those.

Example of what git rebase -i B^ will give you:

pick sha-commit-B some message
pick sha-commit-C some message
pick sha-commit-D some message
pick sha-commit-E some message
pick sha-commit-F some message
# pick sha-commit-empty1 empty
# pick sha-commit-empty2 empty

change that to:

# change commit B's author
pick sha-commit-empty1 empty
squash sha-commit-B some message
# leave commit C alone
pick sha-commit-C some message
# change commit D's author
pick sha-commit-empty2 empty
squash sha-commit-D some message
# leave commit E-F alone
pick sha-commit-E some message
pick sha-commit-F some message

It will prompt you to edit the messages:

# This is a combination of 2 commits.
# The first commit's message is:

empty

# This is the 2nd commit message:

...some useful commit message there...

and you can just remove the first few lines.

answered Aug 28, 2013 at 1:03

There is one additional step to Amber’s answer if you’re using a centralized repository:

git push -f to force the update of the central repository.

Be careful that there are not a lot of people working on the same branch because it can ruin consistency.

If the commit that you want to change is not the last commit, then follow the below steps. If your commit is in different branch then first switch to that branch.

git checkout branch_name

Find commit before the commit that you want to change and find its hash. Then issue rebase command.

git rebase -i -p hash of commit

Then an editor will open and enter ‘edit’ for the commits that you want to change. Leave others with default ‘pick’ option. Once changed enter ‘esc’ key and wq! to exit.

Then issue git commit command with amendment option.

git commit —amend —author=»Username email» —no-edit

Then issue the following command.

git rebase —continue

Once commit author is updated in the local repository, push the changes to the remote repository.

answered Jun 26, 2019 at 5:49

For the merge commit message, I found that I cannot amend it by using rebase, at least on gitlab. It shows the merge as a commit but I cannot rebase onto that #sha. I found this post is helpful.

git checkout <sha of merge>
git commit --amend # edit message
git rebase HEAD previous_branch

This three lines of code did the job for changing the merge commit message (like author).

answered Oct 1, 2019 at 22:33

SOLUTION

1. Install git filter-repo (Git project recommends filter-repo over filter-branch)

   $ PACKAGE_TOOL install git-filter-repo
   

2. Create a file .mailmap in the root of the git repository containing

   New Name <new@ema.il> <old@ema.il>
   

3. Run git filter-repo --use-mailmap

MORE DETAILS

• git-filter-repo lists this as an example in their docs
• Instead of replacing both the name and the email like in the example above, take a look at additional examples in git mailmap documentation
• Instead of using a file named .mailmap by default, you can specify mailmap file by invoking git filter-repo with argument --mailmap <filename>.
• Many more examples on how to further filter branch/tag/whatever can be found in the git-filter-repo project’s README.md.

answered Jan 12, 2021 at 14:17

OPTIONAL: Make sure to stash your local changes if you don’t want to send them to remote.

$ git status
$ git stash

Update the author for the last commit.

$ git log   // Old author in local and remote
$ git commit --amend --author="Author Name <email@address.com>"
$ git log   // New Author in local
$ git push origin <branch> --force-with-lease 
$ git log   // New Author in remote

Then, if you used git stash then recovers your staged changes

$ git stash pop
$ git status

Then, you should to update the configuration for the next commits of the current project.

$ git config user.name "Author Name"
$ git config user.email "<email@address.com>"

And check or also edit this with git config --edit

Clarification: In the rare case that you lose commits using $ ggpush -f you can recover them with reflog. Anyway using --force-with-lease you are protected even more than if you use only -f

GL

• Source
• ZSH

answered Jul 31, 2020 at 17:19

endoramaendorama

4517 silver badges15 bronze badges

Mudassir KhanMudassir Khan

1,6941 gold badge19 silver badges25 bronze badges

alexlzalexlz

6081 gold badge9 silver badges24 bronze badges

As an addition to Eugen Konkov’s answer, it is possible to keep the commit/author date. To only modify the author but not the date of the last three commits use

git rebase --onto HEAD~3 --exec 'GIT_COMMITTER_DATE="$(git log -n 1 --format=%aD)" git commit --amend --reset-author --no-edit --date="$(git log -n 1 --format=%aD)"' HEAD~3

then apply a force push

git push --force-with-lease

answered May 30, 2022 at 7:24

AmerllicAAmerllicA

26.7k14 gold badges125 silver badges148 bronze badges

answered Mar 26, 2019 at 17:34