summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-04 07:26:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-04 07:26:47 (GMT)
commit7c7478f45a67121aeda2e1d276feb34c5786e611 (patch)
tree1a97d484ba1ff9d203209e64974a1a55de409e2c /Documentation
parentc8ddd2aa116710e3442bc54cd750824a88a900d4 (diff)
parent5621760f59c0655e41045c3141deef9791858916 (diff)
downloadgit-7c7478f45a67121aeda2e1d276feb34c5786e611.zip
git-7c7478f45a67121aeda2e1d276feb34c5786e611.tar.gz
git-7c7478f45a67121aeda2e1d276feb34c5786e611.tar.bz2
Merge branch 'rg/a-the-typo'
Typofix. * rg/a-the-typo: fix minor typos
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-commit.txt4
-rw-r--r--Documentation/gitremote-helpers.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index ed0f5b9..afb06ad 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -95,7 +95,7 @@ OPTIONS
--reset-author::
When used with -C/-c/--amend options, or when committing after a
- a conflicting cherry-pick, declare that the authorship of the
+ conflicting cherry-pick, declare that the authorship of the
resulting commit now belongs to the committer. This also renews
the author timestamp.
@@ -112,7 +112,7 @@ OPTIONS
`--dry-run`.
--long::
- When doing a dry-run, give the output in a the long-format.
+ When doing a dry-run, give the output in the long-format.
Implies `--dry-run`.
-z::
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index e4b785e..4a584f3 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -463,7 +463,7 @@ set by Git if the remote helper has the 'option' capability.
GPG sign pushes.
'option push-option <string>::
- Transmit <string> as a push option. As the a push option
+ Transmit <string> as a push option. As the push option
must not contain LF or NUL characters, the string is not encoded.
SEE ALSO