On Wed, Nov 25, 2020 at 6:31 AM Philip Oakley [off-list ref] wrote:

Accidental repetition of phrasing from branch.<name>.pullmode ?

On 25/11/2020 03:29, Felipe Contreras wrote:

quoted

+pull.mode::
+     When "git pull" is run, this determines if it would either merge or
+     rebase the fetched branch. The possible values are 'merge',
+     and 'rebase'. See "branch.<name>.pullmode" for doing
+     this in a non branch-specific manner.
+

s/non//

Same problem in 09/10 I think.
I didn't check the code... Spotted while browsing.

Weird. I could swear I copied the text from pull.rebase. Anyway, now I
did: "see branch.<name>.pullmode" for setting this on a per-branch
basis."

-- 
Felipe Contreras