On Dec 7, 2013 11:32 AM, "Phillip Tutt" <[email protected]> wrote: > > Yes it does. That commit is just prior to commencing work on the laptop. What Huu said about using git clone instead of git init/pull on the laptop sounds like it could have caused the issue. I will need to reset to the last commit on the laptop.
So it's the parent of 4a09c3c? That's the first commit in the laptop log you showed us, but something doesn't add up. Git wouldn't make you do a merge between a commit and its own parent. What does the output of "git log --graph --oneline" look like? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
