I am new to Git and I haven't been able to practice it a lot. So i am asking this question here before i issue this command to our main repo.
I am at branch featureX and now i want to rebase with master (with all the merge history) ... and then push it up stream into my branch. I have read couple of things and i came up with the following set of commands
git rebase --preserve-merges master featureX
git push -u origin featureX
However, given there is no place i can test it out I am not sure if its the right command to issue on our main repo.