Skip to content

Commit a4fad01

Browse files
author
Michelle Tilley
committed
List commits made on HEAD during rebase
1 parent a2cc118 commit a4fad01

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

js/historyview.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,11 @@ define(['d3'], function() {
14641464
setTimeout(function() {
14651465
this.flashProperty(commitsToCopy, 'rebased', function() {
14661466
commitsToCopy.forEach(function(ref) {
1467-
this.commit({rebased: true, rebaseSource: ref}, this.getCommit(ref).message)
1467+
var oldCommit = this.getCommit(ref)
1468+
this.commit({rebased: true, rebaseSource: ref}, oldCommit.message)
1469+
this.addReflogEntry(
1470+
'HEAD', this.getCommit('HEAD').id, 'rebase: ' + (oldCommit.message || oldCommit.id)
1471+
)
14681472
}, this)
14691473
var newHeadCommit = this.getCommit('HEAD')
14701474
this.lock()

0 commit comments

Comments
 (0)