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

Re: Is there a way to add a default `--squash` flag for all merges into a head?

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Mar 7, 2011, 21:10 UTC
Message-ID
<m2r5aibpsl.fsf@igel.home>
In-Reply-To
<9f02bed0-fa18-46b1-a3d3-346e1cc7dc01@k15g2000prk.googlegroups.com>
Dun Peal <dunpealer@gmail.com> writes:
> There's a configuration feaute `branch.<name>.rebase` for specifying
> that all merges into a branch (master in this case) would be done by
> rebase

That's not what it means. It means that a "git pull" is implicitly "git pull --rebase". But if you do an explict merge it will not look at that config setting.

Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Previous: Dun PealNext: Dun Peal
Message 2 of 9 in “Is there a way to add a default `--squash` flag for all merges into a head?”
  1. Dun PealMar 7, 2011
  2. Andreas SchwabMar 7, 2011
  3. Dun PealMar 7, 2011
  4. Junio C HamanoMar 8, 2011
  5. Dun PealMar 9, 2011
  6. Junio C HamanoMar 9, 2011
  7. Dun PealMar 9, 2011
  8. Jay SoffianMar 8, 2011
  9. Dun PealMar 10, 2011

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.