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

Re: Avoiding broken Gitweb links and deleted objects

From
Duy Nguyen <pclouds@gmail.com>
Date
May 10, 2013, 07:04 UTC
Message-ID
<CACsJy8CopioiTrEDfuZK=n1DfJ8_chxV9dEObqpVfHHmJvzyqQ@mail.gmail.com>
In-Reply-To
<7vzjw349y0.fsf@alter.siamese.dyndns.org>
On Fri, May 10, 2013 at 1:37 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 12 quoted lines
> Johannes Sixt <j.sixt@viscovery.net> writes:
> Imagine that a user runs "git rebase" on a history leading to commit
> X to create an alternate, improved history that leads to commit Y.
> What if we teach "git rebase" to record, perhaps by default, an
> "ours" merge on top of Y that takes the tree state of Y but has X as
> its second parent, and "git log" and its family to ignore such an
> artificial "ours" merge that records a tree that is identical to one
> of its parents, again perhaps by default?  "git log" works more or
> less in such a way already, but we might want to teach other modes
> like --full-history and --simplify-merges to ignore "ours" to hide
> such an artificial merge by default, with an audit option to
> unignore them.

What about git-merge? Will it be fooled by these merges while looking for merge bases? -- Duy

Previous: Johannes SixtNext: Junio C Hamano
Message 6 of 14 in “Avoiding broken Gitweb links and deleted objects”
  1. Matt McClureMay 8, 2013
  2. Matt McClureMay 9, 2013
  3. Johannes SixtMay 10, 2013
  4. Junio C HamanoMay 10, 2013
  5. Johannes SixtMay 10, 2013
  6. Duy NguyenMay 10, 2013
  7. Junio C HamanoMay 10, 2013
  8. Duy NguyenMay 10, 2013
  9. Junio C HamanoMay 10, 2013
  10. Matt McClureMay 22, 2013
  11. Junio C HamanoMay 22, 2013
  12. William SwansonMay 10, 2013
  13. Matt McClureMay 22, 2013
  14. William SwansonMay 22, 2013

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.