<div dir="ltr">Thanks.<div><br>Since I tend to do commits from others on the same</div><div>branch name, this should be easy to avoid 99% of the</div><div>time in the future.</div><div><br></div><div>--joel</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 18, 2016 at 12:33 AM, Sebastian Huber <span dir="ltr"><<a href="mailto:sebastian.huber@embedded-brains.de" target="_blank">sebastian.huber@embedded-brains.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Looks all right.<br>
<br>
You can avoid this problem in the future if you add something like this to your .git/config:<br>
<br>
[branch "abc"]<br>
rebase = true<span class=""><br>
<br>
On 16/01/16 21:36, Joel Sherrill wrote:<br>
</span><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">
<br>
Please check that I did not screw the master up.<br>
<br>
I was at a library for an authors' day with Michele. I was committing a GCI patch and accidentally did this.<br>
<br>
Double check and revert if needed.<br>
<br>
Thanks.<br>
<br>
---------- Forwarded message ----------<br></span><span class="">
From: "Joel Sherrill" <<a href="mailto:joel@rtems.org" target="_blank">joel@rtems.org</a> <mailto:<a href="mailto:joel@rtems.org" target="_blank">joel@rtems.org</a>>><br>
Date: Jan 16, 2016 11:18 AM<br></span><span class="">
Subject: [rtems commit] Merge branch 'master' of ssh://<a href="http://dispatch.rtems.org/data/git/" rel="noreferrer" target="_blank">dispatch.rtems.org/data/git/</a> <<a href="http://dispatch.rtems.org/data/git/" rel="noreferrer" target="_blank">http://dispatch.rtems.org/data/git/</a>> rtems<br>
To: <<a href="mailto:vc@rtems.org" target="_blank">vc@rtems.org</a> <mailto:<a href="mailto:vc@rtems.org" target="_blank">vc@rtems.org</a>>><br>
Cc:<br>
<br>
Module: rtems<br>
Branch: master<br>
Commit: c40dd4ed703bbaee7e6492cfbb966a1d5cda7341<br>
Changeset: <a href="http://git.rtems.org/rtems/commit/?id=c40dd4ed703bbaee7e6492cfbb966a1d5cda7341" rel="noreferrer" target="_blank">http://git.rtems.org/rtems/commit/?id=c40dd4ed703bbaee7e6492cfbb966a1d5cda7341</a><br>
<br></span>
Author: Joel Sherrill <<a href="mailto:joel@rtems.org" target="_blank">joel@rtems.org</a> <mailto:<a href="mailto:joel@rtems.org" target="_blank">joel@rtems.org</a>>><span class=""><br>
Date: Sat Jan 16 11:17:43 2016 -0600<br>
<br></span>
Merge branch 'master' of ssh://<a href="http://dispatch.rtems.org/data/git/rtems" rel="noreferrer" target="_blank">dispatch.rtems.org/data/git/rtems</a> <<a href="http://dispatch.rtems.org/data/git/rtems" rel="noreferrer" target="_blank">http://dispatch.rtems.org/data/git/rtems</a>><span class=""><br>
<br>
---<br>
<br>
<br>
<br>
_______________________________________________<br>
vc mailing list<br>
</span><a href="mailto:vc@rtems.org" target="_blank">vc@rtems.org</a> <mailto:<a href="mailto:vc@rtems.org" target="_blank">vc@rtems.org</a>><br>
<a href="http://lists.rtems.org/mailman/listinfo/vc" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/vc</a><span class="HOEnZb"><font color="#888888"><br>
</font></span></blockquote><span class="HOEnZb"><font color="#888888">
<br>
-- <br>
Sebastian Huber, embedded brains GmbH<br>
<br>
Address : Dornierstr. 4, D-82178 Puchheim, Germany<br>
Phone : <a href="tel:%2B49%2089%20189%2047%2041-16" value="+4989189474116" target="_blank">+49 89 189 47 41-16</a><br>
Fax : <a href="tel:%2B49%2089%20189%2047%2041-09" value="+4989189474109" target="_blank">+49 89 189 47 41-09</a><br>
E-Mail : <a href="mailto:sebastian.huber@embedded-brains.de" target="_blank">sebastian.huber@embedded-brains.de</a><br>
PGP : Public key available on request.<br>
<br>
Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.<br>
<br>
</font></span></blockquote></div><br></div>