summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-02-28 02:43:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-28 23:07:14 (GMT)
commitdbf47215e32b9789113e004ae835dcff2e5e52e1 (patch)
tree236a23efd79c75ab2fa066596a33f154df8cc937 /Documentation
parent81d395cc85bb6f04b65d081dae2fd88b750386c9 (diff)
downloadgit-dbf47215e32b9789113e004ae835dcff2e5e52e1.zip
git-dbf47215e32b9789113e004ae835dcff2e5e52e1.tar.gz
git-dbf47215e32b9789113e004ae835dcff2e5e52e1.tar.bz2
rebase docs: fix "gitlink" typo
Change it to "linkgit" so that the reference is properly rendered. Signed-off-by: Kyle Meyer <kyle@kyleam.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6fe9816..dfca489 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -391,7 +391,7 @@ have the long commit hash prepended to the format.
+
By default, or when `no-rebase-cousins` was specified, commits which do not
have `<upstream>` as direct ancestor will keep their original branch point,
-i.e. commits that would be excluded by gitlink:git-log[1]'s
+i.e. commits that would be excluded by linkgit:git-log[1]'s
`--ancestry-path` option will keep their original ancestry by default. If
the `rebase-cousins` mode is turned on, such commits are instead rebased
onto `<upstream>` (or `<onto>`, if specified).