summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-16 12:51:08 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-16 13:11:13 +0100
commit2a59720447ef089946c366033fef6f2861dbe0b5 (patch)
tree9add455a5610a37f514ec0c0bbb839e37269ea0f
parent6ef3d66e497d1c315345d6d8bf539b0d3bb05ba0 (diff)
git- prefixes: Change `git-foo' to `git foo' in docs and comments
No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--README.dsc-import4
-rwxr-xr-xdgit22
2 files changed, 13 insertions, 13 deletions
diff --git a/README.dsc-import b/README.dsc-import
index 4bcf7fc..1ec53b0 100644
--- a/README.dsc-import
+++ b/README.dsc-import
@@ -17,7 +17,7 @@ interface could be designed, which is doubtful):
Dpkg::Compression to get at the tarball.
Each input tarball unpack will be done separately, and will be
- followed by git-add and git-write tree, to obtain a git tree object
+ followed by git add and git write-tree, to obtain a git tree object
corresponding to the tarball contents.
That tree object will be made into a commit object with no parents.
@@ -80,7 +80,7 @@ This has the following properties:
commit. So eg `git blame' will show synthetic commits corresponding
to the correct parts of the input source package.
-* It is possible to `git-cherry-pick' etc. commits representing `3.0
+* It is possible to `git cherry-pick' etc. commits representing `3.0
(quilt)' patches. It is even possible fish out the patch stack as
git branch and rebase it elsewhere etc., since the patch stack is
represented as a contiguous series of commits which make only the
diff --git a/dgit b/dgit
index deb77e0..04e61b8 100755
--- a/dgit
+++ b/dgit
@@ -2051,7 +2051,7 @@ sub git_fetch_us () {
push @specs, qw(heads/*) if deliberately_not_fast_forward;
# This is rather miserable:
- # When git-fetch --prune is passed a fetchspec ending with a *,
+ # When git fetch --prune is passed a fetchspec ending with a *,
# it does a plausible thing. If there is no * then:
# - it matches subpaths too, even if the supplied refspec
# starts refs, and behaves completely madly if the source
@@ -2061,15 +2061,15 @@ sub git_fetch_us () {
# We want to fetch a fixed ref, and we don't know in advance
# if it exists, so this is not suitable.
#
- # Our workaround is to use git-ls-remote. git-ls-remote has its
+ # Our workaround is to use git ls-remote. git ls-remote has its
# own qairks. Notably, it has the absurd multi-tail-matching
- # behaviour: git-ls-remote R refs/foo can report refs/foo AND
+ # behaviour: git ls-remote R refs/foo can report refs/foo AND
# refs/refs/foo etc.
#
# Also, we want an idempotent snapshot, but we have to make two
- # calls to the remote: one to git-ls-remote and to git-fetch. The
- # solution is use git-ls-remote to obtain a target state, and
- # git-fetch to try to generate it. If we don't manage to generate
+ # calls to the remote: one to git ls-remote and to git fetch. The
+ # solution is use git ls-remote to obtain a target state, and
+ # git fetch to try to generate it. If we don't manage to generate
# the target state, we try again.
my $specre = join '|', map {
@@ -4450,10 +4450,10 @@ sub quilt_fixup_multipatch ($$$) {
# 2. Copy .pc from the fake's extraction, if necessary
# 3. Run dpkg-source --commit
# 4. If the result has changes to debian/, then
- # - git-add them them
- # - git-add .pc if we had a .pc in-tree
- # - git-commit
- # 5. If we had a .pc in-tree, delete it, and git-commit
+ # - git add them them
+ # - git add .pc if we had a .pc in-tree
+ # - git commit
+ # 5. If we had a .pc in-tree, delete it, and git commit
# 6. Back in the main tree, fast forward to the new HEAD
# Another situation we may have to cope with is gbp-style
@@ -4462,7 +4462,7 @@ sub quilt_fixup_multipatch ($$$) {
# We would want to detect these, so we know to escape into
# quilt_fixup_gbp. However, this is in general not possible.
# Consider a package with a one patch which the dgit user reverts
- # (with git-revert or the moral equivalent).
+ # (with git revert or the moral equivalent).
#
# That is indistinguishable in contents from a patches-unapplied
# tree. And looking at the history to distinguish them is not