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.sherr...@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? > > --joel > > On Sun, Jan 24, 2016 at 11:47 AM, Gedare Bloom <ged...@rtems.org> wrote: >> >> Again? well this one looks empty at any rate. >> >> >> ---------- Forwarded message ---------- >> From: Joel Sherrill <j...@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: v...@rtems.org >> >> >> Module: rtems >> Branch: master >> Commit: 496288a559563935f37fdaa806a722a8d6707cdf >> Changeset: >> http://git.rtems.org/rtems/commit/?id=496288a559563935f37fdaa806a722a8d6707cdf >> >> Author: Joel Sherrill <j...@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 >> v...@rtems.org >> http://lists.rtems.org/mailman/listinfo/vc >> _______________________________________________ >> devel mailing list >> devel@rtems.org >> http://lists.rtems.org/mailman/listinfo/devel > > _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
