Raffi Enficiaud wrote:
Le 07/10/15 18:49, Stephen Kelly a écrit :
Raffi Enficiaud wrote:
The patch can be rebased manually before being commited. This is what they do in eg. CMake and it is working quite well.
Speaking as an upstream CMake maintainer, this statement is not true. Once a commit is reachable from the master branch it is definitely not rebased. The master branch does not get rewritten. Rewriting long-lived branches is wrong.
I was specifically mentioning the case of PR and patches, hence not yet included in the history: they can be rebased as we want quite easily, although manually (a PR can be downloaded as a patch or pulled into a branch).
I see. I misread the 'before being committed' part of what you wrote.
Temporary branches under review can get rebased. That is very different. Then the temporary branch gets merged to master and the temporary branch is removed.
Correct, in our case, develop is not a temporary branch and has the same public value as master.
You appear to want to rewrite the history of the develop branch of a git repo. You definitely should not do that. Thanks, Steve.