diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-04 16:26:47 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-04 16:26:47 +0900 |
| commit | 7c7478f45a67121aeda2e1d276feb34c5786e611 (patch) | |
| tree | 1a97d484ba1ff9d203209e64974a1a55de409e2c /Documentation | |
| parent | c8ddd2aa116710e3442bc54cd750824a88a900d4 (diff) | |
| parent | 5621760f59c0655e41045c3141deef9791858916 (diff) | |
| download | git-7c7478f45a67121aeda2e1d276feb34c5786e611.tar.gz git-7c7478f45a67121aeda2e1d276feb34c5786e611.tar.xz | |
Merge branch 'rg/a-the-typo'
Typofix.
* rg/a-the-typo:
fix minor typos
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-commit.txt | 4 | ||||
| -rw-r--r-- | Documentation/gitremote-helpers.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index ed0f5b94b..afb06adba 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 e4b785eb6..4a584f3c5 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 |