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

[Xiangfu Liu]

Hi

Before the rebase -i. we have to do 'git fetch -a'. for update local
origin/*. then we can do 'git rebase -i origin/master' base on the local
master branch.

Mostly without '-i' should be ok. it is for merge more commits to one,
delete or edit commit message.

Thanks for commit.
Xiangfu
On Mar 6, 2012 10:49 PM, "Sebastian Huber" <
sebastian.huber at embedded-brains.de> 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".
>
> --
> Sebastian Huber, embedded brains GmbH
>
> Address : Obere Lagerstr. 30, D-82178 Puchheim, Germany
> Phone   : +49 89 18 90 80 79-6
> Fax     : +49 89 18 90 80 79-9
> E-Mail  : sebastian.huber at embedded-**brains.de<sebastian.huber at embedded-brains.de>
> PGP     : Public key available on request.
>
> Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.
> ______________________________**_________________
> rtems-devel mailing list
> rtems-devel at rtems.org
> http://www.rtems.org/mailman/**listinfo/rtems-devel<http://www.rtems.org/mailman/listinfo/rtems-devel>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20120306/acadc64c/attachment-0001.html>