[petsc-dev] did I mess up master?

[Satish Balay]

BTW: copy/pasting the exact git command - and the corresponding
message is always more useful than transcribing..

Satish

On Mon, 30 Mar 2015, Satish Balay wrote:

> You mean 'origin/master' was ahead of 'origin' by 44 commits?
> 
> The following looks ok to me. [presumably 9780fa96a767300e577882a0af3393de3467f0b4
> was where 'master' was at - when you tried to push..]
> 
> $ git log 9780fa96a767300e577882a0af3393de3467f0b4..23524bc85f88d7c2c867e276c52fc9d9816c7ba0
> commit 23524bc85f88d7c2c867e276c52fc9d9816c7ba0
> Merge: a45e4fd 9780fa9
> Author: Mark Adams <mfadams at lbl.gov>
> Date:   Sun Mar 29 07:56:12 2015 -0700
> 
>     Merge branch 'master' of https://bitbucket.org/petsc/petsc
> 
> commit a45e4fd2de284282fd0ffec31edee9d059d8ad33
> Author: Mark Adams <mfadams at lbl.gov>
> Date:   Sun Mar 29 07:55:57 2015 -0700
> 
>     fixed example to compile - demonstrates a bug
> 
> commit cfa1550bfceb2414944d5dfd54be7c44b32992d2
> Author: Mark Adams <mfadams at lbl.gov>
> Date:   Sun Mar 29 07:55:00 2015 -0700
> 
>     var name 'len' was F90 key word
> balay at asterix /home/balay/petsc (master=)
> $ 
> 
> Satish
> 
> On Sun, 29 Mar 2015, Mark Adams wrote:
> 
> > I just pushed to master but I see that I was ahead of master by 44
> > commits.  Was my branch polluted with some other stuff somehow?  I looked
> > at the commits on bitbucket and they look fine.
> > 
> > 07:59 1 edison02 master ~/petsc$ git status
> > # On branch master
> > # Your branch is ahead of 'origin/master' by 44 commits.
> > #
> > # Untracked files:
> > #   (use "git add <file>..." to include in what will be committed)
> > #
> > #       src/snes/examples/tutorials/petsc_kkt_solver_module.mod
> > #       src/snes/examples/tutorials/petsc_kkt_solver_moduleinterfaces.mod
> > nothing added to commit but untracked files present (use "git add" to track)
> > 07:59 edison02 master ~/petsc$ git push origin master
> > 
> 
>