[petsc-dev] strangness in Chebyshev estimate of eigenvalues
Mark Adams
mfadams at lbl.gov
Fri May 20 20:50:00 CDT 2016
On Fri, May 20, 2016 at 1:17 PM, Satish Balay <balay at mcs.anl.gov> wrote:
> Mark,
>
> $ git log --merges origin/mark/snes-ex56c --oneline |grep mark/snes-ex56c
> 27d400f Merge branch 'master' of bitbucket.org:petsc/petsc into
> mark/snes-ex56c
> f3dabe8 Merge branch 'master' of bitbucket.org:petsc/petsc into
> mark/snes-ex56c
> 1df2bc2 Merge branch 'master' of bitbucket.org:petsc/petsc into
> mark/snes-ex56c
> a003960 Merge branch 'master' of bitbucket.org:petsc/petsc into
> mark/snes-ex56c
>
>
> Any perticular reason why you need to constantly merge master to this
> branch?
>
I have been getting tied up with this because I do part of something or
Matt does and it is not in master and I don't want to wait. I cherry-pick
and merge a lot in this process.
Here I just pull from master to get up to date. I guess I don't have to do
it that often as it clutters the history.
>
> Satish
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20160520/9866404f/attachment.html>
More information about the petsc-dev
mailing list