Re: Puzzled at Git

2017-12-04 Thread David Kastrup
Chris Yate writes: > Hi David, > > I'm not sure, but I think you're specifying different ranges. Yes, the rebase needs to be the other way round: I need to rebase on the _stable_ branch because that's what I start with. Sigh. -- David Kastrup ___ l

Re: Puzzled at Git

2017-12-04 Thread Chris Yate
Hi David, I'm not sure, but I think you're specifying different ranges. Remember git rebase -i will be from your *current* branch to an ancestor, (and if it's not a direct ancestor, can include confusing stuff from more than one branch). Also not clear from the context what "origin" is. Usually

Puzzled at Git

2017-12-04 Thread David Kastrup
If I do git log origin/stable/2.20..origin --pretty=oneline the results are 8d889e98371302068af44e1d533e2b4b1a3300b9 (origin/staging, origin/master, origin/HEAD, test-staging, issue5242) Issue 5242: Make context-defs-from-music warn when missing context 006c1adb64dbec4c239b416720bcdce0cae8efd7