How to edit commits that have been pushed to Stash

One of our users has committed using the wrong email address, which is causing a number of different problems. We can't have two identities out there for this developer. I understand that there are ways to "rewrite history" in git, but how does that change when Stash is involved?

2 answers

1 accepted

Hi Jordan,

Stash is "just another Git remote" so you can rewrite history locally and force push it to Stash as normal. All of the normal issues with rewriting history will apply though - rewriting history that's already been shared is usually not a great idea - but it is possible if you synchronize everything carefully with your team.

cheers,

Tim

Thanks Tim, we have a fairly small amount of people that have cloned this repo, so it shouldn't be too difficult to coordinate with them and just have them delete and then clone fresh.

2 votes
Adam Ahmed Atlassian Team Dec 17, 2014

Hi Jordan,

Another fix for this specific problem is to use Git's .mailmap feature, no rewrite necessary. This lets you use a secondary email as an alias for the one your dev really meant to use. https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors

This is basically a file you add to your repo, and Stash will use to display correct author information.

Cheers,

Adam

 

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

23,962 views 26 12
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you