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

Re: Git Evolve

From
Kyle Meyer <kyle@kyleam.com>
Date
Oct 2, 2018, 22:25 UTC
Message-ID
<87r2h8c7f3.fsf@kyleam.com>
In-Reply-To
<877ej0iuhc.fsf@evledraar.gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> On Tue, Oct 02 2018, Taylor Blau wrote:
[...]
Show 22 quoted lines
>> Specifically, I've wanted the 'hg absorb' command. My understanding of
>> the commands functionality is that it builds a sort of flamegraph-esque
>> view of the blame, and then cascades downwards parts of a change. I am
>> sure that I'm not doing the command justice, so I'll defer to [1] where
>> it is explained in more detail.
>>
>> The benefit of this command is that it gives you a way to--without
>> ambiguity--absorb changes into earlier commits, and in fact, the
>> earliest commit that they make sense to belong to.
>>
>> This would simplify my workflow greatly when re-rolling patches, as I
>> often want to rewrite a part of an earlier commit. This is certainly
>> possible by a number of different `git rebase` invocations (e.g., (1)
>> create fixup commits, and then re-order them, or (2) mark points in your
>> history as 'edit', and rewrite them in a detached state, and I'm sure
>> many more).
>>
>> I'm curious if you or anyone else has thought about how this might work
>> in Git.
>
> I've wanted a "git absorb" for a while, but have done no actual work on
> it, I just found out about it.

It may be worth looking into git-autofixup [0] (author cc'd). I learned about it when Magit used it in its magit-commit-absorb command, but I haven't used it yet myself.

[0] https://github.com/torbiak/git-autofixup
-- 
Kyle
Previous: Stefan XenosNext: Taylor Blau
Message 11 of 13 in “Git Evolve”
  1. Stefan XenosSep 29, 2018
  2. Junio C HamanoSep 30, 2018
  3. Stefan XenosSep 30, 2018
  4. Jakub NarebskiOct 4, 2018
  5. Stefan XenosOct 4, 2018
  6. Derrick StoleeOct 1, 2018
  7. Stefan XenosOct 31, 2018
  8. Taylor BlauOct 2, 2018
  9. Ævar Arnfjörð BjarmasonOct 2, 2018
  10. Stefan XenosOct 2, 2018
  11. Kyle MeyerOct 2, 2018
  12. Taylor BlauOct 2, 2018
  13. Johannes SchindelinNov 9, 2018

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.