On 18 June 2015 at 23:28, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Luke Diamand <luke@xxxxxxxxxxx> writes: > >> This is probably user error, but I'm not sure what I'm doing wrong. >> I'm posting here in case anyone else gets the same thing >> >> I'm using 2.4.4.598.gd7bed1d, i.e. 'next' as of today. >> >> I've somehow ended up with history skipping back in time, but git not >> prepared to let let me fix it, or something. >> >> $ git diff upstream/master -- subtree >> - lots of deltas, which look like I've reverted this back several >> revisions (which I haven't AFAIK) > > Are you on the right branch that you think you are working on? Yes. > >> $ git checkout upstream/master -- subtree >> $ git diff upstream/master -- subtree >> -- still lots of deltas > > Does this show _ONLY_ additions? Or does it include modifications > and removals? There are indeed _ONLY_ additions. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html