From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 31 Jul 2026 23:21:04 +0000 (-0700)
Subject: Merge branch 'hn/history-squash' into seen
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a70a46388a0b36731b02d23b529688fb07b41b8;p=thirdparty%2Fgit.git

Merge branch 'hn/history-squash' into seen

The experimental 'git history' command has been taught a new 'squash'
subcommand to fold a range of commits into a single commit, with any
descendants replayed on top.

* hn/history-squash:
  history: re-edit a squash with every message
  sequencer: share the squash message marker helpers and flags
  history: add squash subcommand to fold a range
  history: give commit_tree_ext a message template
  history: extract helper for a commit's parent tree
---

4a70a46388a0b36731b02d23b529688fb07b41b8