mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-13 03:10:03 -05:00
Code Issues Packages Projects Releases 164 Wiki Activity

Update go/libraries/doltcore/sqle/dprocedures/dolt_merge.go

Browse Source 
Co-authored-by: Aaron Son <aaron@dolthub.com>
This commit is contained in:
Zach Musgrave
2023-09-12 11:18:07 -07:00
committed by GitHub
parent 8aa8ebd337
commit b38b002930
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/sqle/dprocedures/dolt_merge.go
+1 -1
View File
@@ -488,7 +488,7 @@ func createMergeSpec(ctx *sql.Context, sess *dsess.DoltSession, dbName string, a
commitSpecStr,
t,
merge.WithSquash(apr.Contains(cli.SquashParam)),
merge.WithNoFf(apr.Contains(cli.NoFFParam)),
merge.WithNoFF(apr.Contains(cli.NoFFParam)),
merge.WithForce(apr.Contains(cli.ForceFlag)),
merge.WithNoCommit(apr.Contains(cli.NoCommitFlag)),
merge.WithNoEdit(apr.Contains(cli.NoEditFlag)),