summaryrefslogtreecommitdiffstats
path: root/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-04 07:36:22 -0700
committerJunio C Hamano <gitster@pobox.com>2017-05-04 07:36:22 -0700
commit4c60d9a1a0d0cd01727aff4334b00cf25935e634 (patch)
tree38c1fba4058501e8fe7e8e2760ec92a236896214 /git-commit.txt
parent8decc2321270ed62283cf47685f2a355b8de4c57 (diff)
downloadgit-htmldocs-4c60d9a1a0d0cd01727aff4334b00cf25935e634.tar.gz
Autogenerated HTML docs for v2.13.0-rc2
Diffstat (limited to 'git-commit.txt')
-rw-r--r--git-commit.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-commit.txt b/git-commit.txt
index ed0f5b94b..afb06adba 100644
--- a/git-commit.txt
+++ b/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::