[petsc-dev] strangness in Chebyshev estimate of eigenvalues

[Jed Brown]

Mark Adams <mfadams at lbl.gov> 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20160525/d0c5df5d/attachment.sig>