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

Re: FW: question about merge in 1.7.10

From
Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date
Feb 24, 2012, 19:29 UTC
Message-ID
<4F47E51B.6080401@in.waw.pl>
In-Reply-To
<1F026B57884A5841B330471696849DE9114503D7@MBX021-W4-CA-5.exch021.domain.local>
On 02/24/2012 03:33 PM, Marlene Cote wrote:
>
> I used merge with -no-commit -no-ff.  So, I assume I won't see any change in behavior, since merge is not performing commits, right?

Hi Marlene, --no-commit only stops the last step, i.e. making of the commit. The tree (working files) is changed before that. So basically after a merge with --no-commit, your tree will be dirty and git status will show modified files.

zbyszek
Previous: Marlene CoteNext: Marlene Cote
Message 2 of 7 in “FW: question about merge in 1.7.10”
  1. Marlene CoteFeb 24, 2012
  2. Zbigniew Jędrzejewski-SzmekFeb 24, 2012
  3. Marlene CoteFeb 24, 2012
  4. Junio C HamanoFeb 24, 2012
  5. Marlene CoteFeb 24, 2012
  6. Junio C HamanoFeb 24, 2012
  7. Junio C HamanoFeb 24, 2012

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.