The IntelliJ platform has had GitHub integration for a few months, but today they rolled out Advanced GitHub Integration: Rebase My GitHub Fork.
What is it? Rebase support.
Now staying up to date with upstream repos is easier than ever in IntelliJ! Best of all, it’s available in the free community edition of IDEA as well as the commercial edition. Integration for other products is underway.