]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fcbc5b 96db173)
Merge branch 'ob/rebase-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Sun, 29 Oct 2023 22:09:58 +0000 (07:09 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 29 Oct 2023 22:09:58 +0000 (07:09 +0900)
Code clean-up.

* ob/rebase-cleanup:
  rebase: move parse_opt_keep_empty() down
  rebase: handle --strategy via imply_merge() as well
  rebase: simplify code related to imply_merge()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.