diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2023-04-29 12:44:14 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-29 12:44:14 +1000 |
commit | aa70723e3a7211c01ccfb78c710dbf7808037c6c (patch) | |
tree | 0c9adc5e1e893762e5c724597699cff0b37f223e /pkg/commands | |
parent | 7db54a948a3247fe7c5d4feadfb27837bd073859 (diff) | |
parent | 21072226d24bf8e2cd9dbd2085b969303a1797eb (diff) |
Merge pull request #2558 from stefanhaller/allow-resetting-author-during-rebase
Diffstat (limited to 'pkg/commands')
-rw-r--r-- | pkg/commands/git_commands/rebase.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/commands/git_commands/rebase.go b/pkg/commands/git_commands/rebase.go index cffc5d68a..5828ffbaa 100644 --- a/pkg/commands/git_commands/rebase.go +++ b/pkg/commands/git_commands/rebase.go @@ -79,7 +79,7 @@ func (self *RebaseCommands) SetCommitAuthor(commits []*models.Commit, index int, } func (self *RebaseCommands) GenericAmend(commits []*models.Commit, index int, f func() error) error { - if index == 0 { + if models.IsHeadCommit(commits, index) { // we've selected the top commit so no rebase is required return f() } |