3 Commits

Author	SHA1	Message	Date
Stefan Haller	703256e92d	Move LocalBranchSortOrder and RemoteBranchSortOrder to user config ... At the same time, we change the defaults for both of them to "date" (they were "recency" and "alphabetical", respectively, before). This is the reason we need to touch so many integration tests. For some of them I decided to adapt the test assertions to the changed sort order; for others, I added a SetupConfig step to set the order back to "recency" so that I don't have to change what the test does (e.g. how many SelectNextItem() calls are needed to get to a certain branch).	2025-07-09 13:15:03 +02:00
Stefan Haller	837f7456ab	Remove target branch from title of rebase menu ... Put it into the individual menu items instead. Again, this is necessary because we are going to add another entry to the menu that is independent of the selected branch.	2024-06-03 14:06:11 +02:00
Stefan Haller	16dceb813b	Show menu instead of prompt when there are conflicts in a rebase or merge ... This solves the issue that previously you could too easily abort a rebase accidentally by hitting escape.	2023-06-01 10:51:48 +02:00