diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-03-11 16:16:26 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-11 16:16:26 +0900 |
| commit | a07baf33e37ddeb82778e572aea2d506d970b5ab (patch) | |
| tree | e633e99b0fac05d0b96c9261a9cd84d65738b8f9 | |
| parent | Merge branch 'js/untravis-windows' (diff) | |
| parent | rebase docs: fix "gitlink" typo (diff) | |
| download | tgif-a07baf33e37ddeb82778e572aea2d506d970b5ab.tar.xz | |
Merge branch 'js/rebase-recreate-merge'
Docfix.
* js/rebase-recreate-merge:
rebase docs: fix "gitlink" typo
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 5629ba4c5d..6363d674b7 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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). |