nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

How to edit commits that have been pushed to Stash

Jordan Packer

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?

Accepted answers

TimP

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

All comments

TimP

Hi Jordan,

cheers,

Tim

Jordan Packer

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.

Adam

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

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

bitbucket

bitbucket-server

bitbucket-administration