On Fri, 2014-01-03 at 13:59 +0800, Alex Shi wrote:
On 01/02/2014 08:03 PM, Jon Medhurst (Tixy) wrote:
The following changes since commit 01239d6842a2e2653b7b42736cf2c10b69d0face:
Merge in gator version 5.16 (2013-10-11 12:53:06 +0100)
are available in the git repository at:
git://git.linaro.org/landing-teams/working/arm/kernel.git lsk-3.10-gator
for you to fetch changes up to dffc698f098d93044e28f4f97206eca6373c7cdf:
Merge in gator version 5.17 (2013-12-19 09:36:46 +0000)
Tixy, The patchset was pushed to lsk-test branch for testing now. Only 2 commits are new for lsk:
When I do a merge I get the 5 commits mentioned in my pull request, these are the five commits which are new since the last time gator was pulled into LSK. The result you have in lsk-test has different SHA1's for the two commits you have and history is lost, it's almost as if you have managed to do some sort of rebase. I am just cloning a fresh repo to see if I can work out if pull behaves different from merge, but as you have already updated the main LSK branch, I guess this is too late now to sort out anyway...