packed_read_raw_ref(): new function, replacing `resolve_packed_ref()`

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 25dcdcc2890f0a6814c0000c3c8970e02c0717f8..afb06adba433ebc985bf88c318be1ff3e7775162 100644 (file)
--- 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::
@@ -463,7 +463,7 @@ order).  See linkgit:git-var[1] for details.
 HOOKS
 -----
 This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`,
-and `post-commit` hooks.  See linkgit:githooks[5] for more
+`post-commit` and `post-rewrite` hooks.  See linkgit:githooks[5] for more
 information.
 
 FILES