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

Re: collapsing commits with rebase

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jan 8, 2009, 02:32 UTC
Message-ID
<20090108023224.GU21154@genesis.frugalware.org>
In-Reply-To
<200901072011.37299.bss@iguanasuicide.net>
On Wed, Jan 07, 2009 at 08:11:32PM -0600, "Boyd Stephen Smith Jr." <bss@iguanasuicide.net> wrote:
> git merge -s sha(D)

You probably mean --squash here, -s stands for --strategy - and I *hope* you don't have git-sha(D) in your PATH, as a custom merge strategy. ;-)

Previous: Boyd Stephen Smith Jr.Next: Boyd Stephen Smith Jr.
Message 7 of 12 in “collapsing commits with rebase”
  1. Geoff RussellJan 8, 2009
  2. Johannes SchindelinJan 8, 2009
  3. Geoff RussellJan 8, 2009
  4. Johannes SchindelinJan 8, 2009
  5. Geoff RussellJan 10, 2009
  6. Boyd Stephen Smith Jr.Jan 8, 2009
  7. Miklos VajnaJan 8, 2009
  8. Boyd Stephen Smith Jr.Jan 8, 2009
  9. Geoff RussellJan 8, 2009
  10. Sitaram ChamartyJan 8, 2009
  11. Boyd Stephen Smith Jr.Jan 8, 2009
  12. nadim khemirJan 10, 2009

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.