I discovered nice future in my IntelliJ IDEA – Changelists!
What is that? It’s just grouping changed files in logical directory, see screen shot below:
As you can see under one name I can have many different files from different directories. And now comes the best part – you can manage them as the one!
Hit “Enter” on changelist title and all files will be opened in editor. I assigned special shortcut to change active changelist – “Shift + Enter”. And the last thing, you can commit the whole changelist at once, without specifying particular files, see command below: