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

[Gedare Bloom]

Somewhat fragmented see:
http://wiki.rtems.org/wiki/index.php/Git_Committers#Update_from_upstream_master_.28RTEMS_head.29
http://wiki.rtems.org/wiki/index.php/Git_Committers#Committing

On Sat, Apr 28, 2012 at 12:56 PM, Joel Sherrill
<joel.sherrill at oarcorp.com> wrote:
> Nice write up Gedare. Is all of this in the wiki?
>
> Gedare Bloom <gedare at rtems.org> wrote:
>
>>Hi,
>>
>>To avoid these merge messages and spurious changesets please stick to
>>using rebase on your checked-out master branch, e.g.
>>$> git pull --rebase upstream master
>>
>>This helps to maintain a linear history in the rtems.git primary
>>repository. Merge messages happen due to a non-fastforward merge on
>>your master branch. The easiest way to avoid conflicts and non-ff
>>merges is to always develop on a branch that you checkout from a
>>vanilla master.
>>
>>When you do notice a non-ff merge the easiest thing to do is to reset
>>your head right away (git reset HEAD^) and then clear the changes (git
>>checkout -f). This should undo the merge and its merge message. Then
>>you can do a rebase and hopefully things will go well.
>>
>>-Gedare
>>
>>
>>On Fri, Apr 27, 2012 at 11:03 PM, Chris Johns <chrisj at rtems.org> wrote:
>>> Module:    rtems
>>> Branch:    master
>>> Commit:    bb43b51e66e5ec8667eb6fddee970b2944a1ad09
>>> Changeset: http://git.rtems.org/rtems/commit/?id=bb43b51e66e5ec8667eb6fddee970b2944a1ad09
>>>
>>> Author:    Chris Johns <chrisj at rtems.org>
>>> Date:      Sat Apr 28 13:06:44 2012 +1000
>>>
>>> Merge branch 'master' of ssh://rgit/data/git/rtems
>>>
>>> ---
>>>
>>>
>>>
>>> _______________________________________________
>>> rtems-vc mailing list
>>> rtems-vc at rtems.org
>>> http://www.rtems.org/mailman/listinfo/rtems-vc
>>
>>_______________________________________________
>>rtems-devel mailing list
>>rtems-devel at rtems.org
>>http://www.rtems.org/mailman/listinfo/rtems-devel