]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit90c80966571f9aae613c24ce731463a27728bdd3
tree8e41d48f0799ed092f211736463600f540361909tree | snapshot
parent4fcbc5b94fdc0748053bb1c45fa04107f5768554commit | diff
parent96db17352d8821ceb99dd9e1c19bd74d680effb7commit | diff
Merge branch 'ob/rebase-cleanup'

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()
Unnamed repository; edit this file 'description' to name the repository.