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

Re: stash-p broken?

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 29, 2014, 17:00 UTC
Message-ID
<xmqq61ig3xsp.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20140729092301.GA13134@peff.net>
Jeff King <peff@peff.net> writes:
> So perhaps we could do something better on the viewing side, and
> "simplify" combined merges for files with all-identical parents.
Or you can ask to show the difference with the first parent, no?

I do not think giving a single-parent diff when --cc/-c is asked for, which is a clear indication that the caller is aware that the commit in question is a merge, is such a good idea.

Previous: Jeff KingNext: Jeff King
Message 6 of 12 in “stash-p broken?”
  1. Michael MigdolJul 29, 2014
  2. Michael MigdolJul 29, 2014
  3. brian m. carlsonJul 29, 2014
  4. Øystein WalleJul 29, 2014
  5. Jeff KingJul 29, 2014
  6. Junio C HamanoJul 29, 2014
  7. Jeff KingJul 29, 2014
  8. Junio C HamanoJul 29, 2014
  9. Jeff KingJul 31, 2014
  10. Junio C HamanoJul 31, 2014
  11. Junio C HamanoJul 29, 2014
  12. Jeff KingJul 31, 2014

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.