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

Amending merge commits?

From
BDBesen, David <david.besen@hp.com>
Date
Jul 25, 2014, 22:03 UTC
Message-ID
<22F01493C523F940B4B5E53BB6D0F5352275F207@G5W2738.americas.hpqcorp.net>
Hi folks,
I think one of my coworkers has stumbled on a git bug -- if you amend a merge commit, and then pull, your amends are lost.
Is this expected behavior?
I've reproduced the problem in a script (attached).  I ran it against a couple of versions of git (1.7.1, 1.7.9, 1.8.4, 2.0.0) and in each case it seemed to lose the amend.
- Dave
Next: David Besen
Message 1 of 8 in “Amending merge commits?”
  1. Besen, DavidJul 25, 2014
  2. David BesenJul 25, 2014
  3. Jonathan NiederJul 25, 2014
  4. Besen, DavidJul 25, 2014
  5. Jonathan NiederJul 25, 2014
  6. Sergei OrganovJul 28, 2014
  7. Jonathan NiederJul 28, 2014
  8. Sergei OrganovJul 28, 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.