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

[Joel Sherrill]

On 03/06/2012 08:48 AM, Sebastian Huber wrote:
> On 03/06/2012 03:43 PM, Joel Sherrill wrote:
>> 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.
> Yes, and a git pull is a git fetch + merge!
>
> Before you use git push, you should make sure that a fast forward is possible,
> e.g. use "git rebase -i".
>
Thanks Sebastian.

-- 
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