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

[RFC/PATCH 0/3] pull: warning improvements part 2

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Dec 15, 2020, 08:46 UTC
Message-ID
<20201215084619.1631180-1-felipe.contreras@gmail.com>

This patch series goes on top of fc/pull-merge-rebase, however, I don't know how I should communicate that clearly, so I'm sending this as RFC to avoid any possible merging issues. It's not really an RFC, and in reality this is not v1, but the end result of many iterations, simply rebased on top of Junio's changes.

While updating the documentation (yet again) I noticed it didn't follow from one paragraph to the next (not a good story). So I decided to rewrite it adding a lot more detail.

The warning has also been changed completely taking into consideration the imput Jeff King shared with us in 2013 from GitHub trainers.

And finally one low-hanging fruit patch.
I have many more in the queue though.
Felipe Contreras (3):
  doc: pull: explain what is a fast-forward
  pull: improve default warning
  pull: cleanup autostash check
 Documentation/git-pull.txt | 38 +++++++++++++++++++++++++++++++++-----
 builtin/pull.c             | 38 +++++++++++++++++++-------------------
 2 files changed, 52 insertions(+), 24 deletions(-)
-- 
2.29.2
Next: Felipe Contreras
Message 1 of 4 in “pull: warning improvements part 2”
  1. 0/3 pull: warning improvements part 2Felipe Contreras, Dec 15, 2020
  2. 1/3 doc: pull: explain what is a fast-forwardFelipe Contreras, Dec 15, 2020
  3. 2/3 pull: improve default warningFelipe Contreras, Dec 15, 2020
  4. 3/3 pull: cleanup autostash checkFelipe Contreras, Dec 15, 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.