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

Re: pull --preserve-merges

From
FGFrancis Galiegue <fg@one2team.net>
Date
Nov 8, 2008, 17:07 UTC
Message-ID
<200811081807.53199.fg@one2team.net>
In-Reply-To
<alpine.DEB.1.00.0811081607300.30769@pacific.mpi-cbg.de>
Le Saturday 08 November 2008 16:08:41 Johannes Schindelin, vous avez écrit :
Show 15 quoted lines
> Hi,
>
> On Fri, 7 Nov 2008, Stephen Haberman wrote:
> > Awhile ago I brought up wanting to have a "rebase with preserve merges"
> > option for `git pull`
>
> That might be something you want, but you cannot call it
>
> 	git pull --preserve-merges
>
> since everybody used to "pull = fetch && merge" would go "Huh? A merge
> _does_ preserve merges".
>
> If at all, you could call it "--rebase=preserve-merges".
>

Why not --rebase --keep-merges? Personnally, I think it makes things clearer since in general options are either standalone or have a value.

-- 
fge
Previous: Johannes SchindelinNext: Stephen Haberman
Message 3 of 6 in “pull --preserve-merges”
  1. Stephen HabermanNov 7, 2008
  2. Johannes SchindelinNov 8, 2008
  3. Francis GaliegueNov 8, 2008
  4. Stephen HabermanNov 8, 2008
  5. Stephen HabermanNov 10, 2008
  6. Johannes SchindelinNov 10, 2008

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.