Re: [cross-project-issues-dev] I think I broke something

[Paul Webster <pwebster@xxxxxxxxxxxxxxxxxxx>]

On Wed, Aug 15, 2012 at 8:16 AM, Mark Russell <mrrussell@xxxxxxxxxx> wrote:

this is the commit I think I messed everything up with. 902663d4bd465dd873dbbe41ce25e622bcd688ed

The web interface seems to be showing all of the changes for that merge commit, but that's not really true.  Your commit really only includes your changes: http://git.eclipse.org/c/simrel/org.eclipse.simrel.build.git/commit/?id=93a463e614110af67c12e484c139c509a97f39a2

To avoid those kind of merge commits you can set a config property:

 branch.master.rebase=true

Later,
PW
-- 
Paul Webster
Hi floor.  Make me a sammich! - GIR