Need help cleaning up git repository

2020-11-05 Thread Peter Dufault
I'm not as good at "git" as I should be. I'd like some help cleaning up my git repository so that I can submit some changes. In particular when I got started I committed some changes to my local copy of master without branching it, and then started merging changes on other branches against tha

RE: Need help cleaning up git repository

2020-11-05 Thread Jan.Sommer
> -Original Message- > From: users On Behalf Of Peter Dufault > Sent: Thursday, November 5, 2020 3:11 PM > To: rtems-us...@rtems.org > Subject: Need help cleaning up git repository > > I'm not as good at "git" as I should be. I'd like some help cleaning up my > git > repository so t

RTEMS 5.1 Release LibBSD Networking Issue

2020-11-05 Thread rvanderwal
Good Morning, I seem to be having an issue with RTEMS 5.1 Release Libbsd networking when I include my own 'rtems_bsd_get_mac_address' function as described in rtemsbsd/include/rtems/bsd/bsd.h. I'm running on a Xilinx Microzed using xilinx_zynq_zedboard BSP and have a minimal RTEMS console applic

Re: Need help cleaning up git repository

2020-11-05 Thread dufault
> On Nov 5, 2020, at 09:40 , jan.som...@dlr.de wrote: > > Ok, I hope I understand everything correctly. > Still, best to make a local copy of your repository directory. I shall do that. > >> You can see that my master is ahead of origin/master, and my local branches >> that I'd like to clean

Re: Need help cleaning up git repository

2020-11-05 Thread Joel Sherrill
On Thu, Nov 5, 2020 at 9:51 AM wrote: > > > > On Nov 5, 2020, at 09:40 , jan.som...@dlr.de wrote: > > > > Ok, I hope I understand everything correctly. > > Still, best to make a local copy of your repository directory. > > I shall do that. > > > > >> You can see that my master is ahead of origin/

Re: Need help cleaning up git repository

2020-11-05 Thread Gedare Bloom
On Thu, Nov 5, 2020 at 9:17 AM Joel Sherrill wrote: > > > > On Thu, Nov 5, 2020 at 9:51 AM wrote: >> >> >> >> > On Nov 5, 2020, at 09:40 , jan.som...@dlr.de wrote: >> > >> > Ok, I hope I understand everything correctly. >> > Still, best to make a local copy of your repository directory. >> >> I s