Re: [cdt-dev] Did I break something?

[Pawel Piech <pawel.piech@xxxxxxxxxxxxx>]

Oops, I captured the wrong window in the second image :-)  Here's the other setting.

On 03/23/2012 08:54 AM, Pawel Piech wrote:

Hi Mikhail,
You didn't break anything, but you should change your git branch settings to perform rebase instead of merge and avoid the extra history entry.  See the two screenshots.

Cheers,
pawel

On 03/23/2012 08:48 AM, Mikhail Khodjaiants wrote:

Hi,

I have noticed the following change in the log after I checked in a small fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=375091.

http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/commit/?id=9e7c69f28952f708bfc1997c318043eee112a4c3

I am still very uncomfortable with git and Egit and will appreciate if anyone checks it to see if broke something.

Thanks,
Mikhail

_______________________________________________
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cdt-dev

_______________________________________________
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cdt-dev

Attachment: branch_rebase.png
Description: PNG image