mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 16:38:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rebase onto implemented

Browse source
This commit is contained in:
Qusijue 2021-08-13 19:11:00 +05:00
parent 592399b1db
commit 521cc0e809
3 changed files with 41 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/js/git/commands.js
View file

@ -615,7 +615,8 @@ var commandConfig = {
'--interactive-test',
'--aboveAll',
'-p',
'--preserve-merges'
'--preserve-merges',
'--onto'
],
regex: /^git +rebase($|\s)/,
execute: function(engine, command) {
@ -645,6 +646,17 @@ var commandConfig = {
return;
}
if (commandOptions['--onto']) {
var args = commandOptions['--onto'].concat(generalArgs);
command.threeArgsImpliedHead(args, ' --onto');
engine.rebaseOnto(args[0], args[1], args[2], {
preserveMerges: commandOptions['-p'] || commandOptions['--preserve-merges']
});
return;
}
command.twoArgsImpliedHead(generalArgs);
engine.rebase(generalArgs[0], generalArgs[1], {
preserveMerges: commandOptions['-p'] || commandOptions['--preserve-merges']