[rtems commit] Merge branch 'master' of ssh://dispatch.rtems.org/data/git/ rtems
gedare at rtems.org
Sun Jan 24 20:34:31 UTC 2016
see sebastians previous email about setting the default behavior for pull.
when you git-pull, it either says 'fast forward' or 'merge'. ffwd is
what you want. merge is what causes the merge-commit msg. you should
always be doing 'git pull --rebase' for rtems
On Sun, Jan 24, 2016 at 1:02 PM, Joel Sherrill
<joel.sherrill at oarcorp.com> wrote:
> I saw that and checked it was empty.
> I am not sure how to know it is going to happen before it does.
> All I did was
> git pull upstream master
> git push
> and I was pretty sure I was on master at the time. If I am reading the
> message right, it even looks like I did that.
> What is going wrong?
> On Sun, Jan 24, 2016 at 11:47 AM, Gedare Bloom <gedare at rtems.org> wrote:
>> Again? well this one looks empty at any rate.
>> ---------- Forwarded message ----------
>> From: Joel Sherrill <joel at rtems.org>
>> Date: Sun, Jan 24, 2016 at 12:09 PM
>> Subject: [rtems commit] Merge branch 'master' of
>> ssh://dispatch.rtems.org/data/git/ rtems
>> To: vc at rtems.org
>> Module: rtems
>> Branch: master
>> Commit: 496288a559563935f37fdaa806a722a8d6707cdf
>> Author: Joel Sherrill <joel at rtems.org>
>> Date: Sat Jan 23 17:57:11 2016 -0600
>> Merge branch 'master' of ssh://dispatch.rtems.org/data/git/rtems
>> vc mailing list
>> vc at rtems.org
>> devel mailing list
>> devel at rtems.org
More information about the devel