summaryrefslogtreecommitdiff
path: root/Documentation/everyday.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/everyday.txt')
-rw-r--r--Documentation/everyday.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index e1fba85660..b2548ef4e6 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -263,7 +263,7 @@ that are not quite ready.
<5> create topic branch as needed and apply, again with my
sign-offs.
<6> rebase internal topic branch that has not been merged to the
-master, nor exposed as a part of a stable branch.
+master or exposed as a part of a stable branch.
<7> restart `pu` every time from the next.
<8> and bundle topic branches still cooking.
<9> backport a critical fix.
@@ -304,7 +304,7 @@ and maintain access to the repository by developers.
* linkgit:git-shell[1] can be used as a 'restricted login shell'
for shared central repository users.
-link:howto/update-hook-example.txt[update hook howto] has a good
+link:howto/update-hook-example.html[update hook howto] has a good
example of managing a shared central repository.