tree dcec81a58bc7d5b5cc3bf47ac7f45d538b3a5b49
parent ed56a60b822ba37c26baa2096c04bb4f6eb61b05
parent 62a5bde827cee1f5b669e1f4d33973fa849511cb
author Junio C Hamano <gitster@pobox.com> 1785363492 -0700
committer Junio C Hamano <gitster@pobox.com> 1785363493 -0700

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