How to combine group of local commits to single push in IDEA?

git intellij-idea push commit
gstackoverflow picture gstackoverflow · Nov 13, 2014 · Viewed 68.3k times · Source

In IDEA I am trying to push some commits.

I have a requirement that on remote server it looks like single action.

I click to push and see following window enter image description here

I expected to see squash checkbox here but don't see it.

Please help me.

Answer

Bohuslav Burghardt picture Bohuslav Burghardt · Nov 13, 2014

You can do it using rebase. Go to VCS/Git/Rebase. Then select Interactive option. It will show you a list of commits, where you can pick which ones you want to squash.

After you hit Start rebasing it will prompt you for a commit message for the squashed commit. After that is done you can push your squashed commit using push dialog.

Squash dialog

More information about rebase in IntelliJ is here.

Related questions

What to gitignore from the .idea folder?

Possible Duplicate: Intellij Idea 9/10, what folders to check into (or not check into) source control? I started using WebStorm for web development and am not sure what to add and what to exclude from our Git repository. Clearly some files …

Read More
unable to remove file that really exists - fatal: pathspec ... did not match any files

unable to remove file that really exists - fatal: pathspec ... did not match any files I have a file under git control that simply will not be deleted. The failing command is: $ git rm .idea/workspace.xml fatal: pathspec '.…

Read More
Change remote repository credentials (authentication) on Intellij IDEA 14

I recently changed my Bitbucket password for security reasons. However, IntelliJ didn't update my repository to the new credentials, so it stops me from pulling/pushing anything to my repository. I am not using any plugins for this, just the …

Read More