amend

Is there a way to remove a from a remote changeset, or to remove an entire changeset? I accidentely pushed a .war file to a remote repo and I want to remove it. Martin Geisler Mercurial tries very hard to keep your data safe, so you can generally not change history. That being said, there are numerous extensions for Mercurial that allows you to quite easily change history anyway. There is a page on the wiki about editing history . That page also explains the consequences. In your specific case, you have to ask yourself if others will have already pulled your changeset? If so, then even if you

Usually, I just run git add file git commit git push but if I amend the commit before pushing it (with git commit --amend ), the next push fails with hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. How can I let git push the changes without merging branches? I only have one branch ( master ) and I'm the only person using this repo so why is it saying this? git branch -a: * master

How do I edit or reword a merge commit's message? git commit --amend works if it's the last commit made ( HEAD ), but what if it comes before HEAD ? git rebase -i HEAD~5 doesn't list the merge commits. If you add the --preserve-merges option (or its synonym, -p ) to the git rebase -i command then git will try to preserve the merges when rebasing, rather than linearizing the history, and you should be able to amend the merge commits as well: git rebase -i -p HEAD~5 Note that, starting git1.7.9.6 (and git1.7.10+), git merge itself will always trigger the editor , for you to add details to a

Although I use Git pretty often, I'm still a beginner. Sometimes, I make a mistake but spot it only after I have committed it. At that point, I usually have to spend a long time on the Internet looking for the command I should use to get rid of it (before pushing). Every time that happens, I find myself wondering what's the difference between the four terms that I usually come across: revert, amend, rollback, undo. I've that it's finally time to learn those differences once and for all. What are they? jub0bs The terms revert and amend have a well defined meaning in Git. In contrast, rollback

Why does the SHA-1 hash of my latest commit change even if I don't make any changes to the commit (message, files) after running git commit --amend ? Say I run the following at the command line. cd ~/Desktop mkdir test_amend cd test_amend git init echo 'foo' > test.txt git add test.txt git commit -m 'initial commit' Then, invoking git log --pretty=oneline --abbrev-commit prints the following message: b96a901 initial commit I then do git commit --amend but I change my mind and decide not to change anything in the last commit. In other words, I leave the files, directories, and message of the

I'm looking for a counter-part of git commit --amend in Mercurial, i.e. a way to modify the commit which my working copy is linked to. I'm only interested in the last commit, not an arbitrary earlier commit. The requirements for this amend-procedure are: if possible, it should not require any extensions. It must not require non-default extensions , i.e. extensions which do not come with an official Mercurial installation. if the commit to amend is one head of my current branch, no new head should be created. If the commit is not head, a new head may be created. the procedure should be safe in