mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-10 10:30:57 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Fixed some documentation typos

Browse Source
This commit is contained in:
Zach Musgrave
2021-08-02 14:14:07 -07:00
parent 6c55b14ecb
commit c794bf0103
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
go/cmd/dolt/commands/remote.go
View File

@@ -49,13 +49,14 @@ AWS cloud remote urls should be of the form {{.EmphasisLeft}}aws://[dynamo-table
aws-creds-type specifies the means by which credentials should be retrieved in order to access the specified cloud resources (specifically the dynamo table, and the s3 bucket). Valid values are 'role', 'env', or 'file'.
\trole: Use the credentials installed for the current user
\tenv: Looks for environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
\tfile: Uses the credentials file specified by the parameter aws-creds-file
role: Use the credentials installed for the current user
env: Looks for environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
file: Uses the credentials file specified by the parameter aws-creds-file
GCP remote urls should be of the form gs://gcs-bucket/database and will use the credentials setup using the gcloud command line available from Google +
The local filesystem can be used as a remote by providing a repository url in the format file://absolute path. See https://en.wikipedia.org/wiki/File_URI_schemethi
The local filesystem can be used as a remote by providing a repository url in the format file://absolute path. See https://en.wikipedia.org/wiki/File_URI_scheme
{{.EmphasisLeft}}remove{{.EmphasisRight}}, {{.EmphasisLeft}}rm{{.EmphasisRight}},
Remove the remote named {{.LessThan}}name{{.GreaterThan}}. All remote-tracking branches and configuration settings for the remote are removed.`,

4
go/libraries/doltcore/merge/merge.go
View File

@@ -877,9 +877,9 @@ func MergeRoots(ctx context.Context, ourRoot, theirRoot, ancRoot *doltdb.RootVal
if err != nil {
return nil, nil, err
}
} else if has, err := newRoot.HasTable(ctx, tblName); err != nil {
} else if newRootHasTable, err := newRoot.HasTable(ctx, tblName); err != nil {
return nil, nil, err
} else if has {
} else if newRootHasTable {
tblToStats[tblName] = &MergeStats{Operation: TableRemoved}
err = tableEditSession.UpdateRoot(ctx, func(ctx context.Context, root *doltdb.RootValue) (*doltdb.RootValue, error) {
return root.RemoveTables(ctx, tblName)