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

[Joel Sherrill]

On 07/18/2012 12:50 AM, Thomas Doerfler wrote:
> Joel,
>
> just a note: These commit messages do not really look useful :-( We had
> that discussion before with different users, so please don't get me wrong...
>
I know. :(

Apparently git generates them when you merge a branch which has
no changes on it.  That seems broken to me.

I accidentally was on the wrong branch and couldn't figure out why
my changes (from another temporary branch) weren't showing up
on the master. The temporary branch I was on had no changes
and this is what got generated.

The other cases were stupid user errors. This was also but why
would git generate a message when there was really nothing
to do?

--joel
> wkr,
>
> Thomas.
>
> Am 17.07.2012 23:16, schrieb Joel Sherrill:
>> Module:    rtems
>> Branch:    master
>> Commit:    fac44e12519e401415af7989b80f8a80f7b7de0f
>> Changeset: http://git.rtems.org/rtems/commit/?id=fac44e12519e401415af7989b80f8a80f7b7de0f
>>
>> Author:    Joel Sherrill<joel.sherrill at oarcorp.com>
>> Date:      Mon Jul  9 11:56:40 2012 -0500
>>
>> 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