Skip to content

Commit 8083f33

Browse files
committed
Add a rebaseOptions parameter to Repository.prototype.continueRebase
1 parent 0f75275 commit 8083f33

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

lib/repository.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,13 +455,16 @@ Repository.prototype.checkoutRef = function(reference, opts) {
455455
* promise, finish() will be called when the
456456
* promise resolves. This callback will be
457457
* provided a detailed overview of the rebase
458+
* @param {RebaseOptions} rebaseOptions Options to initialize the rebase object
459+
* with
458460
* @return {Oid|Index} A commit id for a succesful merge or an index for a
459461
* rebase with conflicts
460462
*/
461463
Repository.prototype.continueRebase = function(
462464
signature,
463465
beforeNextFn,
464-
beforeFinishFn
466+
beforeFinishFn,
467+
rebaseOptions
465468
) {
466469
var repo = this;
467470

@@ -474,7 +477,7 @@ Repository.prototype.continueRebase = function(
474477
throw index;
475478
}
476479

477-
return NodeGit.Rebase.open(repo);
480+
return NodeGit.Rebase.open(repo, rebaseOptions);
478481
})
479482
.then(function(_rebase) {
480483
rebase = _rebase;
@@ -1505,6 +1508,8 @@ Repository.prototype.isReverting = function() {
15051508
* promise, finish() will be called when the
15061509
* promise resolves. This callback will be
15071510
* provided a detailed overview of the rebase
1511+
* @param {RebaseOptions} rebaseOptions Options to initialize the rebase object
1512+
* with
15081513
* @return {Oid|Index} A commit id for a succesful merge or an index for a
15091514
* rebase with conflicts
15101515
*/

0 commit comments

Comments
 (0)