mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/rebase-recreate-merge'
Docfix. * js/rebase-recreate-merge: rebase docs: fix "gitlink" typo
This commit is contained in:
commit
a07baf33e3
|
@ -410,7 +410,7 @@ See also INCOMPATIBLE OPTIONS below.
|
|||
+
|
||||
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).
|
||||
|
|
Loading…
Reference in a new issue