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

[Thomas Dörfler]

Sebastian,

if this makes sense, can you add this info to the RTEMS Wiki?

Thomas.

On 19.07.2012 08:59, Sebastian Huber wrote:
> Hi,
> 
> I think one of the most dangerous default settings in Git is the push
> strategy:
> 
> You can specify what action you want to take in this case, and
> avoid seeing this message again, by configuring 'push.default' to:
>   'nothing'  : Do not push anything
>   'matching' : Push all matching branches (default)
>   'tracking' : Push the current branch to whatever it is tracking
>   'current'  : Push the current branch
> 
> I set it now to 'current'.  The mistake from my last week was due to
> this default push setting.  You can always check that you push the right
> commits with "git status".
> 
> On 07/18/2012 03:39 PM, Joel Sherrill wrote:
>> 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
>>>>
>>>
>>
>>
> 
> 


-- 

--------------------------------------------
Embedded Brains GmbH
Thomas Doerfler        Obere Lagerstrasse 30
D-82178 Puchheim       Germany
email: Thomas.Doerfler at embedded-brains.de
Phone: +49-89-18908079-2
Fax:   +49-89-18908079-9