Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--internal/gitaly/service/operations/rebase.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/internal/gitaly/service/operations/rebase.go b/internal/gitaly/service/operations/rebase.go
index 66d3ac360..f3dcc7b2a 100644
--- a/internal/gitaly/service/operations/rebase.go
+++ b/internal/gitaly/service/operations/rebase.go
@@ -64,6 +64,7 @@ func (s *Server) UserRebaseConfirmable(stream gitalypb.OperationService_UserReba
Committer: committer,
BranchName: string(header.Branch),
UpstreamRevision: startRevision.String(),
+ SkipEmptyCommits: true,
})
if err != nil {
return stream.Send(&gitalypb.UserRebaseConfirmableResponse{