]> git.99rst.org Git - git.git/commit
Merge branch 'ps/history-drop'
authorJunio C Hamano <redacted>
Wed, 15 Jul 2026 20:24:18 +0000 (13:24 -0700)
committerJunio C Hamano <redacted>
Wed, 15 Jul 2026 20:24:19 +0000 (13:24 -0700)
commit955b276e051a20e52cad981613220fd4bf4a0d7a
tree26c87ff7c96b29387027044e5ff1a1105191d3d7
parenta9d2d2acdeafaebc90858e83bc6114f929d303f3
parentd11b348f7840c7ae4aba5d273ff56c813475a88e
Merge branch 'ps/history-drop'

The experimental 'git history' command has been taught a new 'drop'
subcommand to remove a commit, with its descendants replayed onto its
parent.

* ps/history-drop:
  builtin/history: implement "drop" subcommand
  builtin/history: split handling of ref updates into two phases
  replay: expose `replay_result_queue_update()`
  reset: stop assuming that the caller passes in a clean index
  reset: allow the caller to specify the current HEAD object
  reset: introduce ability to skip updating HEAD
  reset: introduce dry-run mode
  reset: modernize flags passed to `reset_working_tree()`
  reset: rename `reset_head()`
  reset: drop `USE_THE_REPOSITORY_VARIABLE`
  read-cache: split out function to drop unmerged entries to stage 0
builtin/history.c
read-cache.c
replay.c
replay.h
sequencer.c
t/meson.build
git clone https://git.99rst.org/PROJECT