mirror of
https://github.com/kahole/edamagit.git
synced 2024-09-11 07:15:31 +03:00
Switch from --preserve-merges
to newer --rebase-merges
(fixes #242)
This commit is contained in:
parent
684939f464
commit
ed502d9e32
@ -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
|
||||
|
||||
|
@ -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' },
|
||||
|
Loading…
Reference in New Issue
Block a user