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

[Joel Sherrill]

This time this message was generated when git saw a file with
trailing spaces on a few lines, reported it was doing a merge,
then said no changes. and applied my patch cleanly.

This was one patch on a temporary branch with an existing file
which had trailing whitespace.  This is the procedure I used
which is from the Wiki. No deviation.

git checkout -b am
git am ../patches/am*
git pull --rebase upstream master
==> Here git reported it found ANOTHER file with trailing whitespace
git push upstream am:master
==> Here it generated the merge email.
git checkout master
git pull upstream master
git log
git branch -d am
git push

I fixed the file with white space but this is odd.


On 09/18/2012 06:00 AM, Joel Sherrill wrote:
> Module:    rtems-testing
> Branch:    master
> Commit:    b821b301eb42e51b280e3fb65a1f7a1c40f5e552
> Changeset: http://git.rtems.org/rtems-testing/commit/?id=b821b301eb42e51b280e3fb65a1f7a1c40f5e552
>
> Author:    Joel Sherrill<joel.sherrill at oarcorp.com>
> Date:      Tue Sep 18 06:02:05 2012 -0500
>
> Merge branch 'master' of ssh://git.rtems.org/data/git/rtems-testing
>
> ---
>
>
>
> _______________________________________________
> rtems-vc mailing list
> rtems-vc at rtems.org
> http://www.rtems.org/mailman/listinfo/rtems-vc


-- 
Joel Sherrill, Ph.D.             Director of Research&   Development
joel.sherrill at OARcorp.com        On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
     Support Available             (256) 722-9985