Imaging I have created a feature branch in GIT, let's call it "feature_branch". I have checked it out and started working in it. I made some commits and now want to
1. Pull changes from master
2. Rebase these new changes from master to feature_branch.
What I do is I press Ctrl+shift+A, type Branches. Open branches popup, navigate to master -> checkout.
Then I press Ctrl+T and update using rebase.
Then I need to rebase changes from feature_branch to master. I go to branches popup again, switch to feature_branch and check it out. Now I do not know how to rebase from master to feature_branch. I do it using command like, because Rebase IDEA dialog looks frightening: what is Onto? What is From? What should I type there?
So, could you help to figure out a better workflow without switching back and forth to checkout and pull and rebase? I am sure that with IDEA I can do this more easily. And please help me to understand Rebase dialog. IDEA help is useless regarding this dialog.