In the latter case, you can merge or rebase by hand, as explained in Merge and Rebase, respectively. This will open the Pull dialog, where you can specify what SmartGit will do after the commits have been fetched: Merge the local commits with the fetched commits or rebase the local commits onto the fetched commits. Use Remote |Pull (or the corresponding toolbar button) to invoke the Pull command. merges or rebases) them into the local branch. The Pull command fetches commits from a remote repository, stores them in the remote branches, and optionally 'integrates' (i.e. SmartGit also has a Synchronize command that combines pulling and pushing. Synchronizing the states of local and remote repositories consists of pulling from and pushing to the remote repositories. This chapter gives you an overview of important SmartGit commands. In either case, the Index will be reverted to the HEAD file content. When unstaging previously staged changes, the staged changes will be moved back to the working tree, if the latter hasn't been modified in the meantime, otherwise the staged changes will be lost. Individual change hunks can be staged and unstaged there. The Changes view of the SmartGit project window can show the changes between the HEAD and the Index, between the HEAD and the working tree, or between the Index and the working tree state of the selected file. If you have staged some file changes and later modified the working tree file again, you can use the Discard command to either revert the working tree file content to the staged changes stored in the Index, or to the file content stored in the repository (HEAD).

If you select a file that has Index changes, invoking Commit will give you the option to commit all staged changes. Explicitly using the Remove command has the same effect, as you may be accustomed to from SVN. If you stage a file that was previously version-controlled, but is now missing in the working tree, it will be marked for removal. The Stage command allows you to save a file's content from your working tree in the Index. With SmartGit, you can make heavy use of the Index, or ignore its presence completely - it's all up to you. The Index is an intermediate cache for preparing a commit.

Rebase head to smartgit