diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-11 18:02:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-11 18:02:54 +0900 |
| commit | decc7317e484bc31d0dfb457e70c9ad5a59fe7b1 (patch) | |
| tree | 092cbff96396a7ea55a41cf8ddb2fe70e03ab722 /git-rebase.txt | |
| parent | 11f1537a82c84e620d742b3bc4256952defb28df (diff) | |
| download | git-htmldocs-decc7317e484bc31d0dfb457e70c9ad5a59fe7b1.tar.gz | |
Autogenerated HTML docs for v2.21.0-155-ge902e
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 5629ba4c5..6363d674b 100644 --- a/git-rebase.txt +++ b/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). |