Mark Adams <[email protected]> writes: > Is rebase -i going to work?
Yes. > I read: > > git rebase -i master > > Note that rebasing to the master does not work if you merged the master > into your feature branch while you were working on the new feature. If you > did this you will need to find the original branch point and call git > rebase with > a SHA1 revision. Where did you read the above? > So I was pulling from master all the time, by mistake. If I do a rebase -i > with /jed/mark/snes-ex56c, will it give me all of the branch to squash? Yes. Note that you may still want distinct commits.
signature.asc
Description: PGP signature
