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

RE: Summary of the problems with git pull

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 10, 2014, 08:53 UTC
Message-ID
<536de90320f06_239010732fc82@nysa.notmuch>
In-Reply-To
<5366db742d494_18f9e4b308aa@nysa.notmuch>
Felipe Contreras wrote:
Show 5 quoted lines
> == git update ==
> 
> Another proposed solution is to have a new command: `git update`. This
> command would be similar to `git pull --ff-only` by default, but it
> could be configured to do merges instead, and when doing so in reverse.
And here it is:
https://github.com/felipec/git/commits/fc/update
Here's the documentation:
https://github.com/felipec/git/wiki/git-update

Works exactly as expected: non-fast-forwards are rejected by default, but can be configured, and parents are reversed when merging.

-- 
Felipe Contreras
Previous: Ping YinNext: Philippe Vaucher
Message 4 of 6 in “Summary of the problems with git pull”
  1. Felipe ContrerasMay 5, 2014
  2. Damien RobertMay 6, 2014
  3. Ping YinMay 7, 2014
  4. Felipe ContrerasMay 10, 2014
  5. Philippe VaucherMay 28, 2014
  6. Felipe ContrerasMay 28, 2014

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.