Renew screenshots for Git and Gerrit exercises
The old screenshots were based on SAP internal systems and URL's and
user-ids were blackened. The new screenshots are now based on
gerrit-review.googlesource.com.
The new screenshots were done with the latest EGit (which will become
2.3) and latest Gerrit (which will become 2.6).
In addition there were some minor improvements in the exercise texts.
Change-Id: I2a877359de07a8ecd2fb61153291f6953038ce79
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/exercises/egit/gerrit/branch-checkout.png b/exercises/egit/gerrit/branch-checkout.png
index 77a9930..f35d374 100644
--- a/exercises/egit/gerrit/branch-checkout.png
+++ b/exercises/egit/gerrit/branch-checkout.png
Binary files differ
diff --git a/exercises/egit/gerrit/change-in-gerrit-2.png b/exercises/egit/gerrit/change-in-gerrit-2.png
index 42a3b2b..b309b34 100644
--- a/exercises/egit/gerrit/change-in-gerrit-2.png
+++ b/exercises/egit/gerrit/change-in-gerrit-2.png
Binary files differ
diff --git a/exercises/egit/gerrit/change-in-gerrit.png b/exercises/egit/gerrit/change-in-gerrit.png
index d2044d9..bc2cfad 100644
--- a/exercises/egit/gerrit/change-in-gerrit.png
+++ b/exercises/egit/gerrit/change-in-gerrit.png
Binary files differ
diff --git a/exercises/egit/gerrit/code-review-voting.png b/exercises/egit/gerrit/code-review-voting.png
index d1c04dc..4429068 100644
--- a/exercises/egit/gerrit/code-review-voting.png
+++ b/exercises/egit/gerrit/code-review-voting.png
Binary files differ
diff --git a/exercises/egit/gerrit/commit-changes-with-amend.png b/exercises/egit/gerrit/commit-changes-with-amend.png
index 8a1c99f..02f4f83 100644
--- a/exercises/egit/gerrit/commit-changes-with-amend.png
+++ b/exercises/egit/gerrit/commit-changes-with-amend.png
Binary files differ
diff --git a/exercises/egit/gerrit/commit-changes-with-changeid.png b/exercises/egit/gerrit/commit-changes-with-changeid.png
index 9fc72e7..dbba9a9 100644
--- a/exercises/egit/gerrit/commit-changes-with-changeid.png
+++ b/exercises/egit/gerrit/commit-changes-with-changeid.png
Binary files differ
diff --git a/exercises/egit/gerrit/configure-push-to-gerrit.txt b/exercises/egit/gerrit/configure-push-to-gerrit.txt
index b0e443c..be93463 100644
--- a/exercises/egit/gerrit/configure-push-to-gerrit.txt
+++ b/exercises/egit/gerrit/configure-push-to-gerrit.txt
@@ -36,8 +36,12 @@
image:gerrit-configuration.png[Gerrit Configuration]
-You can keep the default values in this Wizard page and confirm with
-'Finish':
+Normally you can keep the default values in this Wizard page and
+confirm with 'Finish'.
+
+[WARNING]
+When working with 'gerrit-review.googlesource.com' you need to remove
+the '/p' from the 'Push URI'
image:gerrit-configuration-2.png[Gerrit Configuration]
diff --git a/exercises/egit/gerrit/fetch-from-gerrit-2.png b/exercises/egit/gerrit/fetch-from-gerrit-2.png
index 83f2ffa..4b5e11a 100644
--- a/exercises/egit/gerrit/fetch-from-gerrit-2.png
+++ b/exercises/egit/gerrit/fetch-from-gerrit-2.png
Binary files differ
diff --git a/exercises/egit/gerrit/fetch-from-gerrit-3.png b/exercises/egit/gerrit/fetch-from-gerrit-3.png
index 05e144e..664ee87 100644
--- a/exercises/egit/gerrit/fetch-from-gerrit-3.png
+++ b/exercises/egit/gerrit/fetch-from-gerrit-3.png
Binary files differ
diff --git a/exercises/egit/gerrit/fetch-from-gerrit-4.png b/exercises/egit/gerrit/fetch-from-gerrit-4.png
index ad3e5bd..c2e0f11 100644
--- a/exercises/egit/gerrit/fetch-from-gerrit-4.png
+++ b/exercises/egit/gerrit/fetch-from-gerrit-4.png
Binary files differ
diff --git a/exercises/egit/gerrit/fetch-from-gerrit-5.png b/exercises/egit/gerrit/fetch-from-gerrit-5.png
index 6194793..2619a00 100644
--- a/exercises/egit/gerrit/fetch-from-gerrit-5.png
+++ b/exercises/egit/gerrit/fetch-from-gerrit-5.png
Binary files differ
diff --git a/exercises/egit/gerrit/fetch-from-gerrit.png b/exercises/egit/gerrit/fetch-from-gerrit.png
index c622598..d6b69a4 100644
--- a/exercises/egit/gerrit/fetch-from-gerrit.png
+++ b/exercises/egit/gerrit/fetch-from-gerrit.png
Binary files differ
diff --git a/exercises/egit/gerrit/fetch-from-upstream.png b/exercises/egit/gerrit/fetch-from-upstream.png
index 8f1cee3..9b777c6 100644
--- a/exercises/egit/gerrit/fetch-from-upstream.png
+++ b/exercises/egit/gerrit/fetch-from-upstream.png
Binary files differ
diff --git a/exercises/egit/gerrit/file-list-2.png b/exercises/egit/gerrit/file-list-2.png
index 0c89f92..62f2bad 100644
--- a/exercises/egit/gerrit/file-list-2.png
+++ b/exercises/egit/gerrit/file-list-2.png
Binary files differ
diff --git a/exercises/egit/gerrit/file-list.png b/exercises/egit/gerrit/file-list.png
index 5503856..603d51f 100644
--- a/exercises/egit/gerrit/file-list.png
+++ b/exercises/egit/gerrit/file-list.png
Binary files differ
diff --git a/exercises/egit/gerrit/gerrit-configuration-2.png b/exercises/egit/gerrit/gerrit-configuration-2.png
index 85a810c..1a3f407 100644
--- a/exercises/egit/gerrit/gerrit-configuration-2.png
+++ b/exercises/egit/gerrit/gerrit-configuration-2.png
Binary files differ
diff --git a/exercises/egit/gerrit/gerrit-configuration-3.png b/exercises/egit/gerrit/gerrit-configuration-3.png
index 6fe9af6..a6f13af 100644
--- a/exercises/egit/gerrit/gerrit-configuration-3.png
+++ b/exercises/egit/gerrit/gerrit-configuration-3.png
Binary files differ
diff --git a/exercises/egit/gerrit/gerrit-configuration.png b/exercises/egit/gerrit/gerrit-configuration.png
index 22275a1..291ebf7 100644
--- a/exercises/egit/gerrit/gerrit-configuration.png
+++ b/exercises/egit/gerrit/gerrit-configuration.png
Binary files differ
diff --git a/exercises/egit/gerrit/history-view.png b/exercises/egit/gerrit/history-view.png
index c7b2ff5..3130129 100644
--- a/exercises/egit/gerrit/history-view.png
+++ b/exercises/egit/gerrit/history-view.png
Binary files differ
diff --git a/exercises/egit/gerrit/http-login.png b/exercises/egit/gerrit/http-login.png
new file mode 100644
index 0000000..4a886dc
--- /dev/null
+++ b/exercises/egit/gerrit/http-login.png
Binary files differ
diff --git a/exercises/egit/gerrit/hudson-voter-voting.png b/exercises/egit/gerrit/hudson-voter-voting.png
index f554313..0661281 100644
--- a/exercises/egit/gerrit/hudson-voter-voting.png
+++ b/exercises/egit/gerrit/hudson-voter-voting.png
Binary files differ
diff --git a/exercises/egit/gerrit/inline-comment.png b/exercises/egit/gerrit/inline-comment.png
index 2507b3c..6b478d8 100644
--- a/exercises/egit/gerrit/inline-comment.png
+++ b/exercises/egit/gerrit/inline-comment.png
Binary files differ
diff --git a/exercises/egit/gerrit/merged.png b/exercises/egit/gerrit/merged.png
index cabcef8..2bfb30c 100644
--- a/exercises/egit/gerrit/merged.png
+++ b/exercises/egit/gerrit/merged.png
Binary files differ
diff --git a/exercises/egit/gerrit/notes.png b/exercises/egit/gerrit/notes.png
index fb418a3..91ed289 100644
--- a/exercises/egit/gerrit/notes.png
+++ b/exercises/egit/gerrit/notes.png
Binary files differ
diff --git a/exercises/egit/gerrit/numerical-change-id.png b/exercises/egit/gerrit/numerical-change-id.png
index 209f9b7..645ee9d 100644
--- a/exercises/egit/gerrit/numerical-change-id.png
+++ b/exercises/egit/gerrit/numerical-change-id.png
Binary files differ
diff --git a/exercises/egit/gerrit/open-in-commit-viewer.png b/exercises/egit/gerrit/open-in-commit-viewer.png
index d214420..fed47f6 100644
--- a/exercises/egit/gerrit/open-in-commit-viewer.png
+++ b/exercises/egit/gerrit/open-in-commit-viewer.png
Binary files differ
diff --git a/exercises/egit/gerrit/patch-set-2.png b/exercises/egit/gerrit/patch-set-2.png
index 801fab1..17fd5d0 100644
--- a/exercises/egit/gerrit/patch-set-2.png
+++ b/exercises/egit/gerrit/patch-set-2.png
Binary files differ
diff --git a/exercises/egit/gerrit/publish-comments.png b/exercises/egit/gerrit/publish-comments.png
index 2354140..4324346 100644
--- a/exercises/egit/gerrit/publish-comments.png
+++ b/exercises/egit/gerrit/publish-comments.png
Binary files differ
diff --git a/exercises/egit/gerrit/push-a-change-to-gerrit.txt b/exercises/egit/gerrit/push-a-change-to-gerrit.txt
index 0c3faed..18bf7a6 100644
--- a/exercises/egit/gerrit/push-a-change-to-gerrit.txt
+++ b/exercises/egit/gerrit/push-a-change-to-gerrit.txt
@@ -28,13 +28,18 @@
image:push-to-upstream.png[Push to Upstream]
+If you are pushing over HTTP you are asked to provide user and
+password (if not configured already):
+
+image:http-login.png[HTTP Login]
+
After the change is pushed the confirmation dialog will appear:
image:push-confirmation.png[Push Confirmation]
From the confirmation dialog we see the URL under which the change is
exposed in Gerrit. We also see that the numerical ID of the change is
-'127485' in this case.
+'41480' in this case.
=== Check your Change in Gerrit
@@ -44,7 +49,7 @@
image:change-in-gerrit.png[Change in Gerrit]
* *OR* simply open
- link:https://<gerrit-host>/#/q/status:open,n,z[Gerrit] in
+ link:https://gerrit-review.googlesource.com/#/q/status:open,n,z[Gerrit] in
your web browser and find your change in the list of open changes.
Usually, it is the one on the top as the entries are sorted by time
of last update. Click on the change to get to the change details.
diff --git a/exercises/egit/gerrit/push-confirmation-2.png b/exercises/egit/gerrit/push-confirmation-2.png
index c5ba07d..c8ebc68 100644
--- a/exercises/egit/gerrit/push-confirmation-2.png
+++ b/exercises/egit/gerrit/push-confirmation-2.png
Binary files differ
diff --git a/exercises/egit/gerrit/push-confirmation.png b/exercises/egit/gerrit/push-confirmation.png
index d2ff2b6..f551c32 100644
--- a/exercises/egit/gerrit/push-confirmation.png
+++ b/exercises/egit/gerrit/push-confirmation.png
Binary files differ
diff --git a/exercises/egit/gerrit/push-to-upstream-2.png b/exercises/egit/gerrit/push-to-upstream-2.png
index 23db2d2..7f7b3eb 100644
--- a/exercises/egit/gerrit/push-to-upstream-2.png
+++ b/exercises/egit/gerrit/push-to-upstream-2.png
Binary files differ
diff --git a/exercises/egit/gerrit/push-to-upstream.png b/exercises/egit/gerrit/push-to-upstream.png
index 2fd650f..37b09c5 100644
--- a/exercises/egit/gerrit/push-to-upstream.png
+++ b/exercises/egit/gerrit/push-to-upstream.png
Binary files differ
diff --git a/exercises/egit/gerrit/review-a-change.txt b/exercises/egit/gerrit/review-a-change.txt
index f07482c..22b615d 100644
--- a/exercises/egit/gerrit/review-a-change.txt
+++ b/exercises/egit/gerrit/review-a-change.txt
@@ -81,9 +81,9 @@
+
image:code-review-voting.png[Code Review Voting]
-* The voting in the 'Verified' category will be automatically done by
- the 'HudsonVoter' user, but you may also manually vot ein this
- category.
+* If a Gerrit Trigger build job is configured the voting in the
+ 'Verified' category will be automatically done, but you may also
+ manually vote in this category.
+
image:hudson-voter-voting.png[HudsonVoter Voting]
diff --git a/exercises/egit/gerrit/review.png b/exercises/egit/gerrit/review.png
index af52c9a..fbde4e8 100644
--- a/exercises/egit/gerrit/review.png
+++ b/exercises/egit/gerrit/review.png
Binary files differ
diff --git a/exercises/egit/gerrit/side-by-side.png b/exercises/egit/gerrit/side-by-side.png
index 3823bd4..da4804f 100644
--- a/exercises/egit/gerrit/side-by-side.png
+++ b/exercises/egit/gerrit/side-by-side.png
Binary files differ
diff --git a/exercises/egit/gerrit/submit.png b/exercises/egit/gerrit/submit.png
index 00e55cf..f43fa4e 100644
--- a/exercises/egit/gerrit/submit.png
+++ b/exercises/egit/gerrit/submit.png
Binary files differ
diff --git a/exercises/egit/gerrit/up-to-change.png b/exercises/egit/gerrit/up-to-change.png
index 989026b..ccaf7b3 100644
--- a/exercises/egit/gerrit/up-to-change.png
+++ b/exercises/egit/gerrit/up-to-change.png
Binary files differ
diff --git a/exercises/egit/git/branch-selection.png b/exercises/egit/git/branch-selection.png
index 8f17a3c..a984a56 100644
--- a/exercises/egit/git/branch-selection.png
+++ b/exercises/egit/git/branch-selection.png
Binary files differ
diff --git a/exercises/egit/git/cherry-pick.png b/exercises/egit/git/cherry-pick.png
index 8795a5f..6084803 100644
--- a/exercises/egit/git/cherry-pick.png
+++ b/exercises/egit/git/cherry-pick.png
Binary files differ
diff --git a/exercises/egit/git/clone-git-repository.png b/exercises/egit/git/clone-git-repository.png
index b121119..790fe7e 100644
--- a/exercises/egit/git/clone-git-repository.png
+++ b/exercises/egit/git/clone-git-repository.png
Binary files differ
diff --git a/exercises/egit/git/clone-the-example-repository.txt b/exercises/egit/git/clone-the-example-repository.txt
index c12c095..e700b23 100644
--- a/exercises/egit/git/clone-the-example-repository.txt
+++ b/exercises/egit/git/clone-the-example-repository.txt
@@ -8,18 +8,32 @@
Click 'Clone a Git repository' in the git repositories view.
Enter the following URI in the URI field:
+.for HTTP:
====
- ssh://<your-user-id>@<gerrit-host>:29418/training/calculator
+ https://<your-user-id>@<gerrit-host>/training/sample
====
+.for SSH:
+====
+ ssh://<your-user-id>@<gerrit-host>:29418/training/sample
+====
+
+[NOTE]
+For HTTP you need to enter a password for the authentication. +
+For SSH leave the 'Password' field blank (an extra dialog comes up
+if an SSH passphrase is required).
+
+.Using the 'training/sample' repository from 'gerrit-review.googlesource.com':
+[NOTE]
+Please note that SSH is not enabled on
+'gerrit-review.googlesource.com'. +
+Cloning the repository over HTTP works without authentication.
+
image:clone-git-repository.png[Clone Git repository]
-NOTE: Do not enter anything into the password field, an extra dialog comes up
-if the SSH passphrase is required.
-
Click 'Next'.
-If asked, accept the authenticity of Gerrit host. You will have to
+If asked, accept the authenticity of the Gerrit host. You will have to
accept it only once, on the first access.
You should see some branch names in the next dialog. Make sure all shown
@@ -51,6 +65,11 @@
NOTE: For Mac there is a specific launch configuration with the 'Mac' in the
name.
+image:launch-sample-application.png[Launche Sample Application]
+
+.The sample application:
+image:sample-application.png[Sample Application]
+
=== Get Familiar with Eclispe EGit
==== EGit Documentation
@@ -75,19 +94,23 @@
To get an overview on your git repositories open the 'Git Repositories View'.
Select the example project and click 'Show in > Git Repositories'.
-image:git-repositories-view-2.png[Git repositories view]
+image:git-repositories-view-2.png[Git Repositories View]
Under 'Remotes > origin' you see the fetch and the just created push
configuration. To see the details select the URL and click in the context menu
-on 'Show In > Properties'. To see the complete repository configuration, click
+on 'Properties'. To see the complete repository configuration, click
the same menu entry on the repository node.
+image:repository-properties.png[Repository Properties]
+
==== History View
To browse the history of the repository, open the History View: On the
-repository node in the Git Repositories View click 'Show In > History'. Best you
-arrange the Repositories View and the History View next to each other, as shown
-below.
+repository node in the Git Repositories View click 'Show In > History'
+(Some views, e.g. in the Java EE-Perspective, do not have this
+shortcut, in this case use 'Team > Show in History'). Best you
+arrange the Repositories View and the History View next to each other,
+as shown below.
-image:history-view.png[History view]
+image:history-view.png[History View]
link:index.html[Git Exercises]
diff --git a/exercises/egit/git/commit-changes-with-amend-2.png b/exercises/egit/git/commit-changes-with-amend-2.png
index 745607a..d780f3c 100644
--- a/exercises/egit/git/commit-changes-with-amend-2.png
+++ b/exercises/egit/git/commit-changes-with-amend-2.png
Binary files differ
diff --git a/exercises/egit/git/commit-changes-with-amend.png b/exercises/egit/git/commit-changes-with-amend.png
index e06ca5b..8ce3178 100644
--- a/exercises/egit/git/commit-changes-with-amend.png
+++ b/exercises/egit/git/commit-changes-with-amend.png
Binary files differ
diff --git a/exercises/egit/git/commit-changes.png b/exercises/egit/git/commit-changes.png
index 2c5b43d..755869a 100644
--- a/exercises/egit/git/commit-changes.png
+++ b/exercises/egit/git/commit-changes.png
Binary files differ
diff --git a/exercises/egit/git/conflict-markers.png b/exercises/egit/git/conflict-markers.png
index 3b75939..c9a322d 100644
--- a/exercises/egit/git/conflict-markers.png
+++ b/exercises/egit/git/conflict-markers.png
Binary files differ
diff --git a/exercises/egit/git/conflicts-in-staging-view.png b/exercises/egit/git/conflicts-in-staging-view.png
index a84eb1d..aa9d275 100644
--- a/exercises/egit/git/conflicts-in-staging-view.png
+++ b/exercises/egit/git/conflicts-in-staging-view.png
Binary files differ
diff --git a/exercises/egit/git/create-branch-2.png b/exercises/egit/git/create-branch-2.png
index b9f4e87..aa7384b 100644
--- a/exercises/egit/git/create-branch-2.png
+++ b/exercises/egit/git/create-branch-2.png
Binary files differ
diff --git a/exercises/egit/git/create-branch-3.png b/exercises/egit/git/create-branch-3.png
index 1b6eb77..6dac509 100644
--- a/exercises/egit/git/create-branch-3.png
+++ b/exercises/egit/git/create-branch-3.png
Binary files differ
diff --git a/exercises/egit/git/create-branch-from-history-view.png b/exercises/egit/git/create-branch-from-history-view.png
index 7af4be0..e5a7090 100644
--- a/exercises/egit/git/create-branch-from-history-view.png
+++ b/exercises/egit/git/create-branch-from-history-view.png
Binary files differ
diff --git a/exercises/egit/git/create-branch-from-repositories-view.png b/exercises/egit/git/create-branch-from-repositories-view.png
index 04adbdf..74f04e9 100644
--- a/exercises/egit/git/create-branch-from-repositories-view.png
+++ b/exercises/egit/git/create-branch-from-repositories-view.png
Binary files differ
diff --git a/exercises/egit/git/create-branch.png b/exercises/egit/git/create-branch.png
index 069900c..2ead9c2 100644
--- a/exercises/egit/git/create-branch.png
+++ b/exercises/egit/git/create-branch.png
Binary files differ
diff --git a/exercises/egit/git/develop-a-feature.txt b/exercises/egit/git/develop-a-feature.txt
index 10c5e08..0b80154 100644
--- a/exercises/egit/git/develop-a-feature.txt
+++ b/exercises/egit/git/develop-a-feature.txt
@@ -36,17 +36,28 @@
=== Develop the feature
Simply start editing the source code and implement the feature. The example
project implements a simple calculator, you may want to add an operation.
+
Create a new class 'Divide.java' in the package
-'org.eclipse.example.calc.internal.operations' that implements the interface
-'org.eclipse.example.calc.BinaryOperation' and add a corresponding line to
+'org.eclipse.example.calc.internal.operations' that
+
+* implements the interface 'org.eclipse.example.calc.BinaryOperation' and
+* extends the class 'org.eclipse.example.calc.internal.operations.AbstractOperation'
+
+image:divide-class.png[Divide Class]
+
+To register the new operation add a corresponding line to
the 'Calculator.setupDefaultOperations'.
+image:register-divide.png[Register Divide]
+
You may also decide to do something else like polish the SWT or Swing UI.
=== Test your feature
Run the unit tests. To keep the tutorial setup simple there are only unit tests
for the logic but no UI tests.
+image:run-tests.png[Run Tests]
+
=== Commit your changes locally
Now you want to create a new version of the local repository in your current
feature branch containing your changes. This is called 'commit'.
diff --git a/exercises/egit/git/develop-feature-use-staging-view.txt b/exercises/egit/git/develop-feature-use-staging-view.txt
index 87f8402..9fcb4f1 100644
--- a/exercises/egit/git/develop-feature-use-staging-view.txt
+++ b/exercises/egit/git/develop-feature-use-staging-view.txt
@@ -8,9 +8,9 @@
correctly. Right-click on your Project and select 'Team > Switch to > New
branch'. Select as 'Source ref' the remote tracking branch
'refs/remotes/origin/master' and type into 'Branch name' the name of the new
-branch 'addPower'. Check 'Checkout new branch' and press 'Finish'. This will
-create and checkout a new branch which starts where the remote tracking branch
-'refs/remotes/origin/master' points to.
+branch 'addPowerOperation'. Check 'Checkout new branch' and press 'Finish'.
+This will create and checkout a new branch which starts where the remote
+tracking branch 'refs/remotes/origin/master' points to.
image:create-branch-2.png[Create branch]
@@ -20,6 +20,10 @@
'org.eclipse.example.calc'. Don't forget to register the new class in the
'Calculator.setupDefaultOperations()'.
+image:power-class.png[Power Class]
+
+image:register-power.png[Register Power]
+
=== Do a modification you don't want to commit
Sometimes you want to locally change a file but don't want this modification to
be included in the next commit. E.g. certain project modifications are
@@ -36,19 +40,27 @@
from one area to the other.
Git Staging view should list three files '.project', 'Calculator.java' and
-'Power.java'. Drag only 'Calculator.java' and 'Power.java' to 'Staged changes'.
-Double-click on '.project' to inspect which changes you have done.
+'Power.java' ('.project' appears only if you have configured FindBugs
+to run automatically).
image:staging-view.png[Staging view]
+Double-click on '.project' to inspect which changes you have done
+('.project' appears only if you have configured FindBugs to run
+automatically).
+
+image:staging-view-2.png[Staging view]
+
Drag and drop 'Calculator.java' and 'Power.java' to the 'Staged Changes' area
to mark that they should be included in the next commit.
-image:staging-view-2.png[Staging view]
+image:staging-view-3.png[Staging view]
=== Commit your change
In Git Staging View enter a commit message in the 'Commit message' field and
-press the 'Commit' button near the top-right corner of the view.
+click on the 'Commit' button.
+
+image:staging-view-4.png[Staging view]
=== Cleanup
After inspecting your change to '.project' you decide that you don't want this
diff --git a/exercises/egit/git/divide-class.png b/exercises/egit/git/divide-class.png
new file mode 100644
index 0000000..91a0fc4
--- /dev/null
+++ b/exercises/egit/git/divide-class.png
Binary files differ
diff --git a/exercises/egit/git/fast-forward-merge.png b/exercises/egit/git/fast-forward-merge.png
index 0502209..5313642 100644
--- a/exercises/egit/git/fast-forward-merge.png
+++ b/exercises/egit/git/fast-forward-merge.png
Binary files differ
diff --git a/exercises/egit/git/finish-clone.png b/exercises/egit/git/finish-clone.png
index fc1e546..0f3c9bf 100644
--- a/exercises/egit/git/finish-clone.png
+++ b/exercises/egit/git/finish-clone.png
Binary files differ
diff --git a/exercises/egit/git/git-repositories-view-2.png b/exercises/egit/git/git-repositories-view-2.png
index c53df67..f209300 100644
--- a/exercises/egit/git/git-repositories-view-2.png
+++ b/exercises/egit/git/git-repositories-view-2.png
Binary files differ
diff --git a/exercises/egit/git/history-view-10.png b/exercises/egit/git/history-view-10.png
index 2dd9697..11cf0d2 100644
--- a/exercises/egit/git/history-view-10.png
+++ b/exercises/egit/git/history-view-10.png
Binary files differ
diff --git a/exercises/egit/git/history-view-11.png b/exercises/egit/git/history-view-11.png
index 3f11acc..acf0f4c 100644
--- a/exercises/egit/git/history-view-11.png
+++ b/exercises/egit/git/history-view-11.png
Binary files differ
diff --git a/exercises/egit/git/history-view-12.png b/exercises/egit/git/history-view-12.png
index 3a6a012..b5a99f9 100644
--- a/exercises/egit/git/history-view-12.png
+++ b/exercises/egit/git/history-view-12.png
Binary files differ
diff --git a/exercises/egit/git/history-view-2.png b/exercises/egit/git/history-view-2.png
index 68cc36c..a83eb42 100644
--- a/exercises/egit/git/history-view-2.png
+++ b/exercises/egit/git/history-view-2.png
Binary files differ
diff --git a/exercises/egit/git/history-view-3.png b/exercises/egit/git/history-view-3.png
index c5ac7d6..7b82ea6 100644
--- a/exercises/egit/git/history-view-3.png
+++ b/exercises/egit/git/history-view-3.png
Binary files differ
diff --git a/exercises/egit/git/history-view-4.png b/exercises/egit/git/history-view-4.png
index 592019f..7e543b0 100644
--- a/exercises/egit/git/history-view-4.png
+++ b/exercises/egit/git/history-view-4.png
Binary files differ
diff --git a/exercises/egit/git/history-view-5.png b/exercises/egit/git/history-view-5.png
index 86e9b37..87e96e1 100644
--- a/exercises/egit/git/history-view-5.png
+++ b/exercises/egit/git/history-view-5.png
Binary files differ
diff --git a/exercises/egit/git/history-view-6.png b/exercises/egit/git/history-view-6.png
index c13cd3b..0bbd4fc 100644
--- a/exercises/egit/git/history-view-6.png
+++ b/exercises/egit/git/history-view-6.png
Binary files differ
diff --git a/exercises/egit/git/history-view-7.png b/exercises/egit/git/history-view-7.png
index 32c36ba..6c53e0a 100644
--- a/exercises/egit/git/history-view-7.png
+++ b/exercises/egit/git/history-view-7.png
Binary files differ
diff --git a/exercises/egit/git/history-view-8.png b/exercises/egit/git/history-view-8.png
index 421097e..a4d569e 100644
--- a/exercises/egit/git/history-view-8.png
+++ b/exercises/egit/git/history-view-8.png
Binary files differ
diff --git a/exercises/egit/git/history-view-9.png b/exercises/egit/git/history-view-9.png
index f92d741..d25a793 100644
--- a/exercises/egit/git/history-view-9.png
+++ b/exercises/egit/git/history-view-9.png
Binary files differ
diff --git a/exercises/egit/git/history-view.png b/exercises/egit/git/history-view.png
index dbe124c..3e0c779 100644
--- a/exercises/egit/git/history-view.png
+++ b/exercises/egit/git/history-view.png
Binary files differ
diff --git a/exercises/egit/git/history-view.txt b/exercises/egit/git/history-view.txt
index 232d5db..b0afdbf 100644
--- a/exercises/egit/git/history-view.txt
+++ b/exercises/egit/git/history-view.txt
@@ -69,8 +69,7 @@
Once you have selected a commit in the History View the context menu
offers a lot of operations you can do on a commit.
-* Create a new branch starting from the commit with id
- '51101ae160c684...'
+* Create a new branch starting from the commit with id '27792504fad8...'
* Compare commit '92f83b4af8e...' with the second last commit on your
branch. Which files are different in these two commits?
* Inspect commit 'a8c0e743721d81072de...' in the Commit Viewer. Get a
diff --git a/exercises/egit/git/launch-sample-application.png b/exercises/egit/git/launch-sample-application.png
new file mode 100644
index 0000000..541a3c5
--- /dev/null
+++ b/exercises/egit/git/launch-sample-application.png
Binary files differ
diff --git a/exercises/egit/git/merge-2.png b/exercises/egit/git/merge-2.png
index eedab3d..198d3e1 100644
--- a/exercises/egit/git/merge-2.png
+++ b/exercises/egit/git/merge-2.png
Binary files differ
diff --git a/exercises/egit/git/merge-rebase-and-resolving-conflicts.txt b/exercises/egit/git/merge-rebase-and-resolving-conflicts.txt
index 58bbb05..d6810bf 100644
--- a/exercises/egit/git/merge-rebase-and-resolving-conflicts.txt
+++ b/exercises/egit/git/merge-rebase-and-resolving-conflicts.txt
@@ -17,7 +17,7 @@
* Create a new local branch based on the remote tracking branch
'origin/master'
* You may create the new branch from the History View:
-** Select the project, then click Show 'In > History'
+** Select the project, then click 'Show In > History'
(Some views, e.g. in the Java EE-Perspective, do not have this
shortcut, in this case use 'Team > Show in History')
** In the History View click all toggle buttons as shown in the
@@ -191,4 +191,11 @@
which was checked out before the rebase operation. You may revert the
rebase operation with reset as described above.
+You may hide the additional references such as 'ORIG_HEAD' and
+'FETCH_HEAD' from the History View by disabling 'Show' > 'Additional
+Refs' in the drop-down menu.
+
+image:show-additional-refs.png[Show Additional Refs]
+
+
link:index.html[Git Exercises]
diff --git a/exercises/egit/git/merge-tool-2.png b/exercises/egit/git/merge-tool-2.png
index 46aca77..f828b1f 100644
--- a/exercises/egit/git/merge-tool-2.png
+++ b/exercises/egit/git/merge-tool-2.png
Binary files differ
diff --git a/exercises/egit/git/merge-tool-resolved-conflict-2.png b/exercises/egit/git/merge-tool-resolved-conflict-2.png
index 8b05224..fb01ef8 100644
--- a/exercises/egit/git/merge-tool-resolved-conflict-2.png
+++ b/exercises/egit/git/merge-tool-resolved-conflict-2.png
Binary files differ
diff --git a/exercises/egit/git/merge-tool-resolved-conflict.png b/exercises/egit/git/merge-tool-resolved-conflict.png
index 7640bf7..a29fafc 100644
--- a/exercises/egit/git/merge-tool-resolved-conflict.png
+++ b/exercises/egit/git/merge-tool-resolved-conflict.png
Binary files differ
diff --git a/exercises/egit/git/merge-tool.png b/exercises/egit/git/merge-tool.png
index 6036449..4e75d06 100644
--- a/exercises/egit/git/merge-tool.png
+++ b/exercises/egit/git/merge-tool.png
Binary files differ
diff --git a/exercises/egit/git/merge-with-conflicts.png b/exercises/egit/git/merge-with-conflicts.png
index 1a4915b..beda469 100644
--- a/exercises/egit/git/merge-with-conflicts.png
+++ b/exercises/egit/git/merge-with-conflicts.png
Binary files differ
diff --git a/exercises/egit/git/merge.png b/exercises/egit/git/merge.png
index 803bacb..b8d8c14 100644
--- a/exercises/egit/git/merge.png
+++ b/exercises/egit/git/merge.png
Binary files differ
diff --git a/exercises/egit/git/multiply-class.png b/exercises/egit/git/multiply-class.png
new file mode 100644
index 0000000..c41089a
--- /dev/null
+++ b/exercises/egit/git/multiply-class.png
Binary files differ
diff --git a/exercises/egit/git/new-branch-checked-out.png b/exercises/egit/git/new-branch-checked-out.png
index 3f3e07f..d08bd60 100644
--- a/exercises/egit/git/new-branch-checked-out.png
+++ b/exercises/egit/git/new-branch-checked-out.png
Binary files differ
diff --git a/exercises/egit/git/power-class.png b/exercises/egit/git/power-class.png
new file mode 100644
index 0000000..cbec990
--- /dev/null
+++ b/exercises/egit/git/power-class.png
Binary files differ
diff --git a/exercises/egit/git/rebase-continue.png b/exercises/egit/git/rebase-continue.png
index 9244c10..666cfa4 100644
--- a/exercises/egit/git/rebase-continue.png
+++ b/exercises/egit/git/rebase-continue.png
Binary files differ
diff --git a/exercises/egit/git/rebase-with-conflicts.png b/exercises/egit/git/rebase-with-conflicts.png
index 4a6b2c4..7229767 100644
--- a/exercises/egit/git/rebase-with-conflicts.png
+++ b/exercises/egit/git/rebase-with-conflicts.png
Binary files differ
diff --git a/exercises/egit/git/rebase.png b/exercises/egit/git/rebase.png
index c1844d3..1c39f44 100644
--- a/exercises/egit/git/rebase.png
+++ b/exercises/egit/git/rebase.png
Binary files differ
diff --git a/exercises/egit/git/register-divide.png b/exercises/egit/git/register-divide.png
new file mode 100644
index 0000000..1d0a045
--- /dev/null
+++ b/exercises/egit/git/register-divide.png
Binary files differ
diff --git a/exercises/egit/git/register-multiply.png b/exercises/egit/git/register-multiply.png
new file mode 100644
index 0000000..48ca526
--- /dev/null
+++ b/exercises/egit/git/register-multiply.png
Binary files differ
diff --git a/exercises/egit/git/register-power.png b/exercises/egit/git/register-power.png
new file mode 100644
index 0000000..7f9ce23
--- /dev/null
+++ b/exercises/egit/git/register-power.png
Binary files differ
diff --git a/exercises/egit/git/repository-properties.png b/exercises/egit/git/repository-properties.png
new file mode 100644
index 0000000..2b96fee
--- /dev/null
+++ b/exercises/egit/git/repository-properties.png
Binary files differ
diff --git a/exercises/egit/git/reset-2.png b/exercises/egit/git/reset-2.png
index 6dc8be2..7743c23 100644
--- a/exercises/egit/git/reset-2.png
+++ b/exercises/egit/git/reset-2.png
Binary files differ
diff --git a/exercises/egit/git/reset.png b/exercises/egit/git/reset.png
index 6e05876..bef2669 100644
--- a/exercises/egit/git/reset.png
+++ b/exercises/egit/git/reset.png
Binary files differ
diff --git a/exercises/egit/git/run-tests.png b/exercises/egit/git/run-tests.png
new file mode 100644
index 0000000..8e30cae
--- /dev/null
+++ b/exercises/egit/git/run-tests.png
Binary files differ
diff --git a/exercises/egit/git/sample-application.png b/exercises/egit/git/sample-application.png
new file mode 100644
index 0000000..786b607
--- /dev/null
+++ b/exercises/egit/git/sample-application.png
Binary files differ
diff --git a/exercises/egit/git/show-additional-refs.png b/exercises/egit/git/show-additional-refs.png
new file mode 100644
index 0000000..13ba6d7
--- /dev/null
+++ b/exercises/egit/git/show-additional-refs.png
Binary files differ
diff --git a/exercises/egit/git/staging-view-2.png b/exercises/egit/git/staging-view-2.png
index 0cbdeb5..3ab3441 100644
--- a/exercises/egit/git/staging-view-2.png
+++ b/exercises/egit/git/staging-view-2.png
Binary files differ
diff --git a/exercises/egit/git/staging-view-3.png b/exercises/egit/git/staging-view-3.png
new file mode 100644
index 0000000..0b3b17c
--- /dev/null
+++ b/exercises/egit/git/staging-view-3.png
Binary files differ
diff --git a/exercises/egit/git/staging-view-4.png b/exercises/egit/git/staging-view-4.png
new file mode 100644
index 0000000..5b0c728
--- /dev/null
+++ b/exercises/egit/git/staging-view-4.png
Binary files differ
diff --git a/exercises/egit/git/staging-view.png b/exercises/egit/git/staging-view.png
index 93e41a9..3760050 100644
--- a/exercises/egit/git/staging-view.png
+++ b/exercises/egit/git/staging-view.png
Binary files differ
diff --git a/exercises/egit/git/team-commit.png b/exercises/egit/git/team-commit.png
index c5e5e2a..a4992e0 100644
--- a/exercises/egit/git/team-commit.png
+++ b/exercises/egit/git/team-commit.png
Binary files differ
diff --git a/exercises/egit/git/work-on-branches-in-parallel.txt b/exercises/egit/git/work-on-branches-in-parallel.txt
index 74b29a4..f4e2848 100644
--- a/exercises/egit/git/work-on-branches-in-parallel.txt
+++ b/exercises/egit/git/work-on-branches-in-parallel.txt
@@ -15,13 +15,12 @@
* Create a new local branch based on the remote tracking branch
'origin/master'
* You may create the new branch from the History View:
-** Select the project, then click Show 'In > History'
+** Select the project, then click 'Show In > History'
(Some views, e.g. in the Java EE-Perspective, do not have this
shortcut, in this case use 'Team > Show in History')
** In the History View click all toggle buttons as shown in the
- screenshot (Link with Editor and Selection, Show all changes in
- repository containing the selected resources, Compare Mode,
- Show all Branches and Tags)
+ screenshot (Show all changes in repository containing the selected
+ resources, Compare Mode, Show all Branches and Tags)
+
image:history-view-2.png[History View]
@@ -44,6 +43,11 @@
* Start working on a change, e.g. add a 'Multiply' operation, do not
commit yet, first read on.
+image:multiply-class.png[Multiply Class]
+
+.Calculator.java:
+image:register-multiply.png[Register Multiply]
+
=== Switch branches
Now you want to switch to another branch but you want to continue
working at your new feature later on. The easiest thing to do is to
@@ -88,8 +92,8 @@
image:commit-changes-with-amend.png[Commit Changes with Amend]
** Now you see again the commit message of the last commit you made in
- this branch. Change it to something meaningful and click the
- 'Commit' button.
+ this branch. Change it to something meaningful (e.g remove
+ '[UNFINISHED]') and click the 'Commit' button.
** In the History View you can now see that your first, preliminary
commit was replaced by the new one.
+
