Skip to content

diff: update help output to match docs, et al. #3601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 7, 2020
Merged

diff: update help output to match docs, et al. #3601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f458f9
diff: update help output to match docs
jorgeorpinel Apr 6, 2020
7d8046a
terms: git->Git, scm->SCM, spacing
jorgeorpinel Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions dvc/command/diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,8 @@ def run(self):

def add_parser(subparsers, parent_parser):
DIFF_DESCRIPTION = (
"Show changes between commits in the DVC repository,"
" or between a commit and the workspace. "
"Prints the list of paths added, modified, or deleted."
"Show added, modified, or deleted data between commits in the DVC"
" repository, or between a commit and the workspace."
)
diff_parser = subparsers.add_parser(
"diff",
Expand Down
2 changes: 1 addition & 1 deletion dvc/command/init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def add_parser(subparsers, parent_parser):
action="store_true",
default=False,
help="Initiate DVC in directory that is "
"not tracked by any scm tool (e.g. git).",
"not tracked by any SCM tool (e.g. Git).",
)
init_parser.add_argument(
"-f",
Expand Down
2 changes: 1 addition & 1 deletion dvc/output/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def __init__(self, path):

class OutputAlreadyTrackedError(DvcException):
def __init__(self, path):
msg = "output '{}' is already tracked by scm (e.g. git)".format(path)
msg = "output '{}' is already tracked by SCM (e.g. Git)".format(path)
super().__init__(msg)


Expand Down
2 changes: 1 addition & 1 deletion dvc/scm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Manages source control systems(e.g. Git)."""
"""Manages source control systems (e.g. Git)."""

from dvc.scm.base import Base
from dvc.scm.git import Git
Expand Down
2 changes: 1 addition & 1 deletion dvc/scm/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Manages source control systems(e.g. Git) in dvc."""
"""Manages source control systems (e.g. Git) in DVC."""

import os

Expand Down
2 changes: 1 addition & 1 deletion scripts/completion/dvc.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ _dvc_commands() {
"commit:Save changed data to cache and update DVC-files."
"config:Get or set config settings."
"destroy:Remove DVC-files, local DVC config and data cache."
"diff:Show changes between commits in the DVC repository, or between a commit and the workspace."
"diff:Show added, modified, or deleted data between commits in the DVC repository, or between a commit and the workspace."
"fetch:Get files or directories tracked by DVC from remote storage into the cache."
"get-url:Download or copy files from URL."
"get:Download data from DVC repository."
Expand Down