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

Issue #128 Preserve Merges for rebase

Browse source
This commit is contained in:
Peter Cottle 2013-10-09 21:10:29 -07:00
parent c18433766f
commit 6769634217
7 changed files with 117 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -444,7 +444,9 @@ var commandConfig = {
sc: /^gr($|\s)/,
options: [
'-i',
'--aboveAll'
'--aboveAll',
'-p',
'--preserve-merges'
],
regex: /^git +rebase($|\s)/,
execute: function(engine, command) {
@ -464,7 +466,9 @@ var commandConfig = {
}
command.twoArgsImpliedHead(generalArgs);
engine.rebase(generalArgs[0], generalArgs[1]);
engine.rebase(generalArgs[0], generalArgs[1], {
preserveMerges: commandOptions['-p'] || commandOptions['--preserve-merges']
});
}
},