On Fri, Jul 17, 2009 at 10:48:39AM -0500, Craig A. Berry wrote: > If you happen to have been on a different branch than blead when you > did the git pull --rebase, that might explain why it didn't find > anything (based on a very cursory look at the git rebase man page). I was in the blead branch, did 'git am' x 2; 'git log' showed my two commits; did 'git push ...', got the "can't fast-forward error"; did 'git pull --rebase', got the 'nothing to do message', then bingo, 'git log' shows those same two commits, but now with you as committer! I guess git is being clever. > I thought I could do a little grunt work while Merijn was on vacation > -- sorry if I've just complicated things. No, that's fine. I'm just applying things to blead at the moment that I want in maint and that no-one else seems to have got round to applying yet. -- Lear: Dost thou call me fool, boy? Fool: All thy other titles thou hast given away; that thou wast born with.Thread Previous