Expanding on what William Pursell said, you probably ended up in vim. Save your changes and exit the editor by typing : to enter a command, followed by wq, then press enter. To exit vim without saving your changes do :q! instead. To change this default to something you’re more familiar with, you can set … Read more
You can go to Commit -> choose Commit All(Amend) or Commit Staged(Amend). Take a look at the picture.
Yes, it’s the commit timestamp. Inspecting the contents of the two commits reveals: $ git cat-file commit 82c7363bcfd727fe2d6b0a98412f71a10c8849c9 tree d87cbcba0e2ede0752bdafc5938da35546803ba5 author Thomas <xxx> 1400700200 +0200 committer Thomas <xxx> 1400700200 +0200 hello $ git cat-file commit 7432fcf82b65d9d757efd73ef7d6bff4707f99bd tree d87cbcba0e2ede0752bdafc5938da35546803ba5 author Thomas <xxx> 1400700200 +0200 committer Thomas <xxx> 1400700214 +0200 hello If you amended in the same … Read more
This should only be the case if you’re amending an already-pushed commit. Generally you should never do that as you’re then modifying published history. In your case however, you should be able to get away with push -f, which will overwrite the remote commit with your amended revision.
Try git commit –amend –no-edit.
Here’s a command that will remove an offending line from a file’s history in all your branches: git filter-branch –tree-filter ‘sed -i “/sensitive information/ d” filename’ — –all This checks out every revision, runs the sed command on it, then commits that revision back. The sed command in this case matches any lines containing the … Read more
The terms revert and amend have a well defined meaning in Git. In contrast, rollback and undo do not have such a well defined meaning, and are open to interpretation. Reverting a commit… …means creating (on the current branch) a new commit that applies the inverse changes that another commit introduced. It’s the preferred approach … Read more
Easiest solution (but please read this whole answer before doing this): git rebase -i <hash-of-commit-preceding-the-incorrect-one> In the editor that opens, change pick to reword on the line for the incorrect commit. Save the file and close the editor. The editor will open again with the incorrect commit message. Fix it. Save the file and close … Read more
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. –perserve-merges has been deprecated in favour … Read more
With the release of Mercurial 2.2, you can use the –amend option with hg commit to update the last commit with the current working directory From the command line reference: The –amend flag can be used to amend the parent of the working directory with a new commit that contains the changes in the parent … Read more