diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2014-09-18 23:03:25 +0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-09-29 09:30:04 -0700 |
| commit | f51a48ec3aacaa01357c891c79dfc45aae0efeff (patch) | |
| tree | 3d47986230e1bc188149c96e2a9082c6be1446d2 /Documentation/git-cherry-pick.txt | |
| parent | Merge branch 'maint-1.8.5' into maint-1.9 (diff) | |
| download | tgif-f51a48ec3aacaa01357c891c79dfc45aae0efeff.tar.xz | |
Documentation/git-rebase.txt: document when --fork-point is auto-enabled
Running "git rebase" without giving a specific commit with respect
to which the operation is done enables --fork-point mode, while
telling the command to rebase with respect to a specific commit,
i.e. "git rebase <upstream>" does not.
This was not mentioned in the DESCRIPTION section of the manual
page, even though the case of omitted <upstream> was otherwise
discussed. That in turn made actual behavior of vanilla "git
rebase" hardly discoverable.
While we are at it, clarify the --fork-point description itself as
well.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
0 files changed, 0 insertions, 0 deletions