Set branch.autosetuprebase = always in your user settings to prevent this 
from happening in new branches:
http://wiki.eclipse.org/Platform-releng/Git_Workflows#Configure_the_workspace

For exisiting local branches, you may have to set
branch.<branchname>.rebase = true
in the repo config.

Markus



From:   Laurent Goubet <[email protected]>
To:     [email protected]
Date:   2013-09-03 17:00
Subject:        Re: [cross-project-issues-dev] Wrong push on Kepler SR2
Sent by:        [email protected]



In fact ... I think the issue is just that I've used the default EGit's 
"pull" instead of a pull rebase, so probably nothing to revert?

Laurent Goubet
Obeo

On 03/09/2013 16:53, Laurent Goubet wrote:
Hi all, 

I just did something I don't really understand on the aggregation 
repository, and pushed a merging commit ( 
http://git.eclipse.org/c/simrel/org.eclipse.simrel.build.git/commit/?h=Kepler_maintenance&id=0caf9d67fc9d0d0bdcc18485fbb3f1181387d565
 
) along with my real commit, as a result I think I broke a number of other 
projects (emf, xtext, koneki...). 

I will revert these changes and hope that the "merge" didn't break 
anything else. 

Sorry about that. 

Laurent Goubet 
Obeo 


_______________________________________________
cross-project-issues-dev mailing list
[email protected]
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev

[attachment "laurent_goubet.vcf" deleted by Markus Keller/Zurich/IBM] 
_______________________________________________
cross-project-issues-dev mailing list
[email protected]
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev

_______________________________________________
cross-project-issues-dev mailing list
[email protected]
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev

Reply via email to