[rtems commit] Merge branch 'master' of ssh://git.rtems.org/data/git/rtems

[Joel Sherrill]

I did not do a git merge this time. :(

I committed a 1 line patch and pushed it to my personal
repo's master. Than I got the non-fast-forward message.
So I did a "git fetch upstream" which didn't resolve it.
Neither did a simple "git pull"
"git pull upstream master" finally pulled a number of changes
and when I did the "git push upstream master", it apparently
did this. :(

Earlier I thought we decided it was a side-effect of git merge.

I still don't have this down. I was trying to be careful but my
git-ignorance is still an issue. :(

<sigh>

--joel

On 03/06/2012 08:37 AM, Joel Sherrill wrote:
> Module:    rtems
> Branch:    master
> Commit:    314d3272df763ef1a152be726e5d5385449fe046
> Changeset: http://git.rtems.org/rtems/commit/?id=314d3272df763ef1a152be726e5d5385449fe046
>
> Author:    Joel Sherrill<joel.sherrill at oarcorp.com>
> Date:      Tue Mar  6 08:36:49 2012 -0600
>
> Merge branch 'master' of ssh://git.rtems.org/data/git/rtems
>
> ---
>
>
>
> _______________________________________________
> rtems-vc mailing list
> rtems-vc at rtems.org
> http://www.rtems.org/mailman/listinfo/rtems-vc


-- 
Joel Sherrill, Ph.D.             Director of Research&   Development
joel.sherrill at OARcorp.com        On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
     Support Available             (256) 722-9985