git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v8 08/10] pull: add pull.mode

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Dec 2, 2020, 05:04 UTC
Message-ID
<CAMP44s0VuP+GkrcyNtQnTerZOiMm4f1qSzuizHgsMddHqOvjXg@mail.gmail.com>
In-Reply-To
<a3be85cd-a01a-4ed9-bf98-09785e79fb85@iee.email>
On Wed, Nov 25, 2020 at 6:31 AM Philip Oakley <philipoakley@iee.email> wrote:
Show 14 quoted lines
>
> Accidental repetition of phrasing from branch.<name>.pullmode ?
>
> On 25/11/2020 03:29, Felipe Contreras wrote:
> > +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
Previous: Philip OakleyNext: Felipe Contreras
Message 10 of 13 in “Reject non-ff pulls by default”
  1. 00/10 Reject non-ff pulls by defaultFelipe Contreras, Nov 25, 2020
  2. 02/10 pull: cleanup autostash checkFelipe Contreras, Nov 25, 2020
  3. 03/10 pull: trivial cleanupFelipe Contreras, Nov 25, 2020
  4. 05/10 pull: display default warning only when non-ffFelipe Contreras, Nov 25, 2020
  5. 04/10 pull: move default warningFelipe Contreras, Nov 25, 2020
  6. 07/10 rebase: add REBASE_DEFAULTFelipe Contreras, Nov 25, 2020
  7. 06/10 test: pull-options: revert unnecessary changesFelipe Contreras, Nov 25, 2020
  8. 08/10 pull: add pull.modeFelipe Contreras, Nov 25, 2020
  9. Philip OakleyNov 25, 2020
  10. Felipe ContrerasDec 2, 2020
  11. 09/10 pull: add pull.mode=ff-onlyFelipe Contreras, Nov 25, 2020
  12. 01/10 pull: refactor fast-forward checkFelipe Contreras, Nov 25, 2020
  13. 10/10 pull: improve default warningFelipe Contreras, Nov 25, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.