Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
rebase docs: fix "gitlink" typo
author
Kyle Meyer
<kyle@kyleam.com>
Thu, 28 Feb 2019 02:43:15 +0000
(21:43 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 28 Feb 2019 23:07:14 +0000
(08:07 +0900)
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>
Documentation/git-rebase.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
81d395c
)
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index 6fe98165dccd8545803635a0ded3f17dc53fc939..dfca489e69940cad134348f696f79487756b2a79 100644
(file)
--- 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,
+
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).
`--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).