So I really don't understand the command line for rebase. What I have: My last two commits on master should have either been on develop, or on a branch off develop.
>From my last commit on develop (666e9), I did a version number bump (15003), a >merge into master (95231) -- those two on a branch "release/a5.3-NoDiagonal" >(the branch is now gone, and a tag points to 95231), and then two commits -- >one to clean up ignored files (ea0fe), and one to fix a bug (c9aef). That's >currently master. I need both of those last two (ea0fe and c9aef) moved to develop. I don't want to merge master to develop, as develop has other things I want in the dev environment for debugging. I don't have upstream changes to merge in; I'm not trying to maintain local changes as an upstream advances. I have read the manual page more than three times, and still don't get it. I understand that I want to ultimately do something like "git rebase develop", but restrict it to only the last two commits from master. Or rather, I think I want to do that. But I can't figure out how to do that restriction. The git book has this nice clarification: > It works by going to the common ancestor of the two branches (the one you’re > on and the one you’re rebasing onto), But that's the problem -- I don't want to start from the common ancestor. The git book has that "more interesting example", that has "git rebase --onto master server client". And it looks like I might actually want "git rebase --onto develop x y". But I don't really understand what I want to use for x and y. (and don't ask me to explain git pull --rebase ... didn't even know about it until I got to that section of the git book page) --- Entertaining minecraft videos http://YouTube.com/keybounce -- 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/d/optout.
