[Toybox] grep -A/B/C doesn't respect -n

[Bobby Bingham]

On Thu, Feb 04, 2016 at 05:52:28PM -0600, Rob Landley wrote:
> Sigh. I fixed one issue on this machine, pushed it, fixed the other on
> the other machine, accidentlly committed and pulled, and it added a
> merge commit I didn't notice until after I pushed.
>
> I need a way to tell git "if you can't do a fast forward, FAIL". If get

git pull --ff-only

Or, since it sounds like ou end goal is to just rebase your local
commits on top of the newly fetched revisions:

git pull --rebase

--
Bobby

 1454642638.0