This might be a stupid question (of course), but for everything I read / found, it doesn't match what I want to do ... and this is the basic GIT situation.
To make my situation simpler, I have two branches:
- master (main branch)
- function (created from the master)
I am working on my branch of functions, at this time other people make changes to the wizard, changes that I would like to receive on my property branch. I know that I need to use git rebasebeacause, I just want to keep my function branch up to date.
The problem is that when I reinstall git checkout feature && git reabse master, the commits found are in the commit list that needs to be clicked.
To summarize, I would like that when I do my reboot, and I click, there are only my commits executed by function, and only those, and not those that were from rebase. I would like my permutation to be quiet, without noise in my functional branch.
If necessary, I can show the .gitconfig file.
FYI I'm working on PhpStorm with a GIT interface, but my problem is the same as on the command line
Thanks
Matteo Geffrey.
source
share