diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 16:33:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 16:33:16 -0800 |
| commit | b1acf0200aa1efd66d18ed4e108792e1068464a9 (patch) | |
| tree | cbe03352fd89f04dad76fcd2c16544999ae21cbf /git-rebase.txt | |
| parent | cf77b0414a44eadfcd0c74dfcae739427b7d2cce (diff) | |
| download | git-htmldocs-b1acf0200aa1efd66d18ed4e108792e1068464a9.tar.gz | |
Autogenerated HTML docs for v1.8.5.2-227-g53f347
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 94e07fdab..2889be6bd 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -324,6 +324,16 @@ fresh commits so it can be remerged successfully without needing to "revert the reversion" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details). +--fork-point:: +--no-fork-point:: + Use 'git merge-base --fork-point' to find a better common ancestor + between `upstream` and `branch` when calculating which commits have + have been introduced by `branch` (see linkgit:git-merge-base[1]). ++ +If no non-option arguments are given on the command line, then the default is +`--fork-point @{u}` otherwise the `upstream` argument is interpreted literally +unless the `--fork-point` option is specified. + --ignore-whitespace:: --whitespace=<option>:: These flag are passed to the 'git apply' program |