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

Re: Keep original author with git merge --squash?

From
Jeff King <peff@peff.net>
Date
Feb 12, 2015, 09:28 UTC
Message-ID
<20150212092824.GA19626@peff.net>
In-Reply-To
<CAN7QDoKQAZKUt_MHWjgt1k3PvXQv6XTcjdijh8KRodO3=VD47A@mail.gmail.com>
On Wed, Feb 11, 2015 at 09:21:04AM -0800, David Glasser wrote:
> (I'm not sure if this should be a flag to --squash or to commit.
> Maybe `git merge --squash`; `git commit --use-squashed-author`?  Seems
> like it should be not too hard to implement; SQUASH_MSG is pretty
> parseable.  Or just a config value.)

It sounds like "git commit -c" is close to what you want, which will pull the author and commit message from a particular commit. But I don't think there is a convenient way to name the commit in your case (it is likely to be the first commit on the branch you are squash-merging, but there isn't a shorthand for that).

I assume you are already munging in your editor the template provided by "git commit" after the squash? What would be really nice, IMHO, is if there was a way to set the author during that edit (e.g., by moving one of the "Author:" lines to the top of the file). That would cover your use case, I think, and would also be useful in general.

-Peff
Previous: David GlasserNext: Michael Haggerty
Message 2 of 18 in “Keep original author with git merge --squash?”
  1. David GlasserFeb 11, 2015
  2. Jeff KingFeb 12, 2015
  3. Michael HaggertyFeb 12, 2015
  4. Jeff KingFeb 12, 2015
  5. David GlasserFeb 12, 2015
  6. Junio C HamanoFeb 12, 2015
  7. David GlasserFeb 12, 2015
  8. Junio C HamanoFeb 12, 2015
  9. David GlasserFeb 12, 2015
  10. David GlasserFeb 12, 2015
  11. Junio C HamanoFeb 12, 2015
  12. Jeff KingFeb 12, 2015
  13. Junio C HamanoFeb 12, 2015
  14. Jeff KingFeb 13, 2015
  15. Junio C HamanoFeb 13, 2015
  16. Jeff KingFeb 13, 2015
  17. David GlasserFeb 13, 2015
  18. David GlasserFeb 13, 2015

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.