Thanks. Since I tend to do commits from others on the same branch name, this should be easy to avoid 99% of the time in the future.
--joel On Mon, Jan 18, 2016 at 12:33 AM, Sebastian Huber < [email protected]> wrote: > Looks all right. > > You can avoid this problem in the future if you add something like this to > your .git/config: > > [branch "abc"] > rebase = true > > On 16/01/16 21:36, Joel Sherrill wrote: > >> >> Please check that I did not screw the master up. >> >> I was at a library for an authors' day with Michele. I was committing a >> GCI patch and accidentally did this. >> >> Double check and revert if needed. >> >> Thanks. >> >> ---------- Forwarded message ---------- >> From: "Joel Sherrill" <[email protected] <mailto:[email protected]>> >> Date: Jan 16, 2016 11:18 AM >> Subject: [rtems commit] Merge branch 'master' of ssh:// >> dispatch.rtems.org/data/git/ <http://dispatch.rtems.org/data/git/> rtems >> To: <[email protected] <mailto:[email protected]>> >> Cc: >> >> Module: rtems >> Branch: master >> Commit: c40dd4ed703bbaee7e6492cfbb966a1d5cda7341 >> Changeset: >> http://git.rtems.org/rtems/commit/?id=c40dd4ed703bbaee7e6492cfbb966a1d5cda7341 >> >> Author: Joel Sherrill <[email protected] <mailto:[email protected]>> >> Date: Sat Jan 16 11:17:43 2016 -0600 >> >> Merge branch 'master' of ssh://dispatch.rtems.org/data/git/rtems < >> http://dispatch.rtems.org/data/git/rtems> >> >> --- >> >> >> >> _______________________________________________ >> vc mailing list >> [email protected] <mailto:[email protected]> >> http://lists.rtems.org/mailman/listinfo/vc >> > > -- > Sebastian Huber, embedded brains GmbH > > Address : Dornierstr. 4, D-82178 Puchheim, Germany > Phone : +49 89 189 47 41-16 > Fax : +49 89 189 47 41-09 > E-Mail : [email protected] > PGP : Public key available on request. > > Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG. > >
_______________________________________________ devel mailing list [email protected] http://lists.rtems.org/mailman/listinfo/devel
