To start with, we are going to perform a very simple rebase, where we will introduce a new file, commit that file, make a change to it, and then commit it again so that we end up with two new commits.
Before we start, we need a repository to work in. You can use a previous clone of jgit, but to get a close-to-identical output from the example, you can clone the jgit repository.
The jgit repository can be cloned as follows:
$ git clone https://git.eclipse.org/r/jgit/jgit chapter4
$ cd chapter4We start by creating a local branch and then make two commits by performing the following steps; these are the commits that we want to rebase onto another branch:
- Check out a new branch,
rebaseExample, which tracksorigin/stable-3.1:
$ git checkout -b rebaseExample --track origin/stable-3.1
Branch rebaseExample set up to track remote branch stable-3.1 from origin.
Switched to a new branch 'rebaseExample'- Make two commits on the
rebaseExamplebranch...