undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc'

Browse Source 
Doc update.

* ws/refer-to-forkpoint-config-in-rebase-doc:
  Document `rebase.forkpoint` in rebase man page
This commit is contained in:
Junio C Hamano 2021-10-06 13:40:12 -07:00
commit 6926f2e135
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-rebase.txt
View File

@ -446,7 +446,8 @@ When --fork-point is active, 'fork_point' will be used instead of
ends up being empty, the <upstream> will be used as a fallback. ends up being empty, the <upstream> will be used as a fallback.
+ +
If <upstream> is given on the command line, then the default is If <upstream> is given on the command line, then the default is
`--no-fork-point`, otherwise the default is `--fork-point`. `--no-fork-point`, otherwise the default is `--fork-point`. See also
`rebase.forkpoint` in linkgit:git-config[1].
+ +
If your branch was based on <upstream> but <upstream> was rewound and If your branch was based on <upstream> but <upstream> was rewound and
your branch contains commits which were dropped, this option can be used your branch contains commits which were dropped, this option can be used