On 11 April 2018 at 23:08, Andreas Heiduk <ashei...@gmail.com> wrote: > - reflow some paragraphs > --- > Documentation/githooks.txt | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-)
I have reviewed the resulting githooks.txt. See the diff below for two more instances that I found. For the second hunk, I have difficulties parsing that paragraph, but I still claim those should be backticks and *git* read-tree... Martin diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index ab5ce80e13..e3c283a174 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -80,7 +80,7 @@ This hook is invoked by linkgit:git-am[1]. It takes no parameter, and is invoked after the patch is applied and a commit is made. This hook is meant primarily for notification, and cannot affect -the outcome of 'git am'. +the outcome of `git am`. pre-commit ~~~~~~~~~~ @@ -400,8 +400,8 @@ when the tip of the current branch is updated to the new commit, and exit with a zero status. For example, the hook can simply run `git read-tree -u -m HEAD "$1"` -in order to emulate 'git fetch' that is run in the reverse direction -with `git push`, as the two-tree form of `read-tree -u -m` is +in order to emulate `git fetch` that is run in the reverse direction +with `git push`, as the two-tree form of `git read-tree -u -m` is essentially the same as `git checkout` that switches branches while keeping the local changes in the working tree that do not interfere with the difference between the branches.
