Done, but note in my previous email with a full cut and paste of what I did I never got any messages about misbehavior
On Oct 2, 2014, at 11:30 AM, Jed Brown <[email protected]> wrote: > Satish Balay <[email protected]> writes: > >> balay@asterix /home/balay/petsc (master=) >> $ git co next >> Switched to branch 'next' >> Your branch is behind 'origin/next' by 1963 commits, and can be >> fast-forwarded. >> (use "git pull" to update your local branch) >> balay@asterix /home/balay/petsc (next<) >> >> >> Did old next get remerged into new next? Should I rewind it again? > > https://bitbucket.org/petsc/petsc/commits/8c34c3ad2d52157761586f2bb6d4466aeb01b511 > > Barry should > > $ git config pull.ff only > > so he can stop making undesirable merges from upstream.
