Skip to content

Instantly share code, notes, and snippets.

@oiami
Forked from carlosmcevilly/gist:2221249
Created June 9, 2014 07:21
Show Gist options
  • Save oiami/701f3afde0cfe3aaac1f to your computer and use it in GitHub Desktop.
Save oiami/701f3afde0cfe3aaac1f to your computer and use it in GitHub Desktop.
If:
- you add and commit with the wrong email address in git, and
- your remote has a hook set up to prevent you from pushing with the bad address
Then you need to amend the author of your commit before push can succeed:
1. fix your email address in git config:
$ git config user.name "Your Name"
$ git config user.email "your@address.com"
$ git submodule foreach --recursive 'git config user.name "Your Name" && git config user.email "your@address.com"'
2. then do a rebase:
$ git rebase -i HEAD~1
# git brings up your editor.
3. in the editor, mark the commit as 'edit' then save and exit the editor
4. do an amend that resets the author now that your address is changed:
$ git commit --amend --reset-author
5. finish with a rebase:
$ git rebase --continue
# git says:
# Successfully rebased and updated refs/heads/master.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment