Rebase Branches Dialog
Use this dialog box to specify the branch to rebase, the new base, the rebasing mode, and configure the rebasing procedure.
Item | Description |
---|---|
Git Root | From this drop-down list, select the path to the local repository in which you want to rebase a branch. |
Branch | From this drop-down list, select the branch to rebase. By default, the current working branch is selected. If you specify another branch, it will be automatically checked out first. |
Interactive | Select this checkbox to view and possibly edit a list of commits to be rebased. |
Preserve Merges | Select this checkbox to have the possibility to recreate merges instead of ignoring them. The checkbox is available only when the Interactive checkbox is selected. |
Onto | Use this drop-down list to specify the new base for the selected branch. To specify the required commit, type its commit hash or use an expression, for example, of the following structure:<branch>~<number of commits backwards between the latest commit (HEAD) and the required commit> .Refer to the Git commit naming conventions for details. If no commit is specified, the HEAD of the selected branch is used as the new base. |
Validate | Click this button to check that the commit specified in the Onto field exists and view which files were affected in it. |
From | Use this drop-down list to specify the commit starting from which you want to apply the branch to the new base. Type the required commit hash or use an expression, for example, of the following structure:<branch>~<number of commits backwards between the latest commit (HEAD) and the required commit> .Refer to the Git commit naming conventions for details. To apply the entire branch, leave the field empty. |
Validate | Click this button to check that the commit specified in the From field exists and view which files were affected in it. |
Show Tags | Select this checkbox to have tagged commits included in the Onto and From drop-down lists. |
Show Remote Branches | Select this checkbox to have branches in the remote repository included in the Onto drop-down list. |
Merge Strategy | From this drop-down list, select the merge strategy. The available options are:
|
Do not use merge strategies | When this checkbox is selected, no merge strategy is applied during rebase. |
Rebase | Click this button to initiate rebasing according to the defined settings. |