diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-06-10 12:03:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 12:03:22 +0200 |
| commit | 906d21f3cea91d5a11ce06630804aae99115a74c (patch) | |
| tree | 5da2fd997128a5098f50a092fedc083495a274b5 /pkg/gui/controllers/basic_commits_controller.go | |
| parent | 6cb2ac6fcce09830cd426e49a2c5f6b79db31a32 (diff) | |
| parent | 7780f1264ac34e32b5a52bed667feaa0a67fa8d2 (diff) | |
Improve "Find base commit for fixup" command when there are changes for master commits (#3645)
- **PR Description**
If exactly one candidate from inside the current branch is found, we
return that one even if there are also hunks belonging to master
commits; we disregard those in this case.
- **Please check if the PR fulfills these requirements**
* [x] Cheatsheets are up-to-date (run `go generate ./...`)
* [x] Code has been formatted (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting))
* [x] Tests have been added/updated (see
[here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)
for the integration test guide)
* [ ] Text is internationalised (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation))
* [ ] Docs have been updated if necessary
* [x] You've read through your own file changes for silly mistakes etc
Diffstat (limited to 'pkg/gui/controllers/basic_commits_controller.go')
0 files changed, 0 insertions, 0 deletions