mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-05 11:21:58 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

pr feedback

Browse Source
This commit is contained in:
Andy Arthur
2021-05-05 15:24:53 -07:00
parent fa888f40d1
commit 4a4534bc30
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/commands/merge.go
+1 -1
View File
@@ -58,7 +58,7 @@ var fkWarningMessage = "Warning: This merge is being applied to tables that have
type MergeCmd struct{}
// Name is returns the name of the Dolt cli command. This is what is used on the command line to invoke the command
// Name returns the name of the Dolt cli command. This is what is used on the command line to invoke the command
func (cmd MergeCmd) Name() string {
return "merge"
}
go/cmd/dolt/commands/merge_base.go
+3 -3
View File
@@ -28,15 +28,15 @@ import (
var mergeBaseDocs = cli.CommandDocumentationContent{
ShortDesc: `Find the common ancestor of two commits.`,
LongDesc: `Find the common ancestor of two commits.`,
Synopsis: []string{
LongDesc: `Find the common ancestor of two commits, and return the ancestor's commit hash.'`,
Synopsis: []string{
`{{.LessThan}}commit spec{{.GreaterThan}} {{.LessThan}}commit spec{{.GreaterThan}}`,
},
}
type MergeBaseCmd struct{}
// Name is returns the name of the Dolt cli command. This is what is used on the command line to invoke the command
// Name returns the name of the Dolt cli command. This is what is used on the command line to invoke the command
func (cmd MergeBaseCmd) Name() string {
return "merge-base"
}