kahole/edamagit
1
1
Fork 0
mirror of https://github.com/kahole/edamagit.git synced 2024-09-11 07:15:31 +03:00
Code Issues Projects Releases Wiki Activity

Switch from --preserve-merges to newer --rebase-merges (fixes #242)

Browse Source
This commit is contained in:
kahole 2023-03-01 10:33:48 +01:00
parent 684939f464
commit ed502d9e32
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
# Changelog
## [0.6.37] - 2023-03-01
- Switch from `--preserve-merges` to newer `--rebase-merges` in rebasing options
- Upgrade to newer refs api to fix breakage on coming VSCode versions (Burak @unexge)
- Upgrade dependencies

2
src/commands/rebasingCommands.ts
View File

@ -23,7 +23,7 @@ export async function rebasing(repository: MagitRepository) {
const switches = [
{ key: '-k', name: '--keep-empty', description: 'Keep empty commits' },
{ key: '-p', name: '--preserve-merges', description: 'Preserve merges' },
{ key: '-p', name: '--rebase-merges', description: 'Rebase merges' },
{ key: '-c', name: '--committer-date-is-author-date', description: 'Lie about committer date' },
{ key: '-a', name: '--autosquash', description: 'Autosquash' },
{ key: '-A', name: '--autostash', description: 'Autostash' },