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

Re: Easy Non-Fast-Forward Pushes

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 5, 2015, 01:42 UTC
Message-ID
<xmqqfv9k5iea.fsf@gitster.dls.corp.google.com>
In-Reply-To
<ygeioel2cw1.fsf@lassekliemann.de>
Lasse Kliemann <lasse@lassekliemann.de> writes:
> 1. Try pushing to origin/master. If it works, fine. If not, goto 2.
>
> 2. Push to the appropriate personal branch.

I wonder what happens to this user _after_ that change gets integrated on the project side. Presumably somebody picks up the change from the "personal branch", does necessary merge and updates the master, so the next time "git pull" is done, it will fast-forward?

I have a feeling that running trivial merges on the server-side when a push is made, and immedately pulling that result back might help such userbase who does not care too much about the history better, instead of using the bare-metal 'git pull' and 'git push'. You'd be scripting on the client side to do the above two steps for your end users anyway, so it would not be too much of a stretch to make that script a bit smarter still?

Previous: Lasse KliemannNext: Junio C Hamano
Message 4 of 5 in “Easy Non-Fast-Forward Pushes”
  1. Lasse KliemannFeb 27, 2015
  2. Stefan BellerFeb 27, 2015
  3. Lasse KliemannMar 1, 2015
  4. Junio C HamanoMar 5, 2015
  5. Junio C HamanoFeb 27, 2015

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.