]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a0feb86 aa1df81)
Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2022 19:54:27 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2022 19:54:27 +0000 (12:54 -0700)
commita524c627a424171c9cc2be2258725adc3f0bcc5a
tree9699e6c34eb24a9b2d9981c303b4b8e2a89ba489tree | snapshot
parenta0feb8611d4c0b2b5d954efe4e98207f62223436commit | diff
parentaa1df8146d70bb85c63b0999868fe29aebc1173ecommit | diff
Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes

* pw/rebase-keep-base-fixes:
  rebase --keep-base: imply --no-fork-point
  rebase --keep-base: imply --reapply-cherry-picks
  rebase: factor out branch_base calculation
  rebase: rename merge_base to branch_base
  rebase: store orig_head as a commit
  rebase: be stricter when reading state files containing oids
  t3416: set $EDITOR in subshell
  t3416: tighten two tests
Unnamed repository; edit this file 'description' to name the repository.