summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-03-21 13:32:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-21 13:32:42 -0700
commitfb238fb4bab65d9a82fd7e22ab12c414b188463a (patch)
treec2abfc6614cc8d478885cdf89b56731863192d77 /Documentation
parentMerge branch 'tb/avoid-gcc-on-darwin-10-6' (diff)
parentMerge branch 'mm/doc-hooks-linkgit-fix' into maint (diff)
downloadtgif-fb238fb4bab65d9a82fd7e22ab12c414b188463a.tar.xz
Sync with maint
* maint: Documentation: fix broken linkgit to git-config git-compat-util: st_add4: work around gcc 4.2.x compiler crash
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/githooks.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 7ba0ac965d..a2f59b194c 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -397,7 +397,7 @@ preceding SP is also omitted. Currently, no commands pass any
'extra-info'.
The hook always runs after the automatic note copying (see
-"notes.rewrite.<command>" in linkgit:git-config.txt[1]) has happened, and
+"notes.rewrite.<command>" in linkgit:git-config[1]) has happened, and
thus has access to these notes.
The following command-specific comments apply: