Using IntelliJ to amend git commit message

View => Tool Windows => Version Control. (Windows (Alt + 9) / OS X (Cmd + 9))

IntelliJ 2017.1 and higher => Go to Log and right click + reword or press F2.

While you are on the same branch, ( your checked out branch is the same )

Amend is supported: invoke "Commit Changes" and select the checkbox "Amend commit" in the Commit Dialog. Then press "Commit" button, and the commit will be amended to the previous one.

However, the support is limited:

• you can't see the details of the commit being amended,
• if you don't have any uncommitted changes (for example, you just want to change the message of the previous commit without adding more changes to it), you won't be able to invoke "Commit".

Finally found a workaround for this.. This issue was troubling me for days.

1. Go to Version Control -Log tab
2. Select the version, one below your changes. Right click and say "reset current branch to here"
3. Select "Soft" and click on Reset, this is very important, you need to click on soft only so that your changes are not lost.
4. Check in version control , local changes, your changes will be avialable in same changelist
5. Right click on the change list and select commit.

6. It will show you your previous commit message, now you can amend the comments and say commit and push

   Note: This solution uses android studio as intellij platform.