mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 07:58:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added testable interactive rebase. It doesn't fully test everything (mainly the GUI), but is a start

Browse source
This commit is contained in:
Patrick 2014-07-24 17:24:24 -04:00
parent 55ac6da589
commit 72cc7d6bd3
2 changed files with 71 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -569,6 +569,7 @@ var commandConfig = {
sc: /^gr($|\s)/,
options: [
'-i',
'--interactive-test',
'--aboveAll',
'-p',
'--preserve-merges'
@ -581,12 +582,23 @@ var commandConfig = {
if (commandOptions['-i']) {
var args = commandOptions['-i'].concat(generalArgs);
command.twoArgsImpliedHead(args, ' -i');
engine.rebaseInteractive(
args[0],
args[1], {
aboveAll: !!commandOptions['--aboveAll']
}
);
if (commandOptions['--interactive-test']) {
engine.rebaseInteractiveTest(
args[0],
args[1], {
interactiveTest: commandOptions['--interactive-test']
}
);
}
else {
engine.rebaseInteractive(
args[0],
args[1], {
aboveAll: !!commandOptions['--aboveAll'],
}
);
}
return;
}