mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/rebase-recreate-merge'

Browse Source 
Docfix.

* js/rebase-recreate-merge:
  rebase docs: fix "gitlink" typo
This commit is contained in:
Junio C Hamano
2019-03-11 16:16:26 +09:00
parent d61ddb5189 dbf47215e3
commit a07baf33e3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-rebase.txt
View File

@ -410,7 +410,7 @@ See also INCOMPATIBLE OPTIONS below.
+ +
By default, or when `no-rebase-cousins` was specified, commits which do not By default, or when `no-rebase-cousins` was specified, commits which do not
have `<upstream>` as direct ancestor will keep their original branch point, 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 `--ancestry-path` option will keep their original ancestry by default. If
the `rebase-cousins` mode is turned on, such commits are instead rebased the `rebase-cousins` mode is turned on, such commits are instead rebased
onto `<upstream>` (or `<onto>`, if specified). onto `<upstream>` (or `<onto>`, if specified).