diff --git a/api/pom.xml b/api/pom.xml
index a497beb0..81a28d83 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -7,7 +7,7 @@
adito-nb-git
de.adito.git
- 1.5.0
+ 1.5.1
api
diff --git a/gui/pom.xml b/gui/pom.xml
index 2d71e914..3252ec3f 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -7,7 +7,7 @@
adito-nb-git
de.adito.git
- 1.5.0
+ 1.5.1
gui
diff --git a/impl/pom.xml b/impl/pom.xml
index 884e5835..7f1cd38b 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -7,7 +7,7 @@
adito-nb-git
de.adito.git
- 1.5.0
+ 1.5.1
impl
diff --git a/nbm/pom.xml b/nbm/pom.xml
index cf7fcc97..5115ced7 100644
--- a/nbm/pom.xml
+++ b/nbm/pom.xml
@@ -7,7 +7,7 @@
adito-nb-git
de.adito.git
- 1.5.0
+ 1.5.1
nbm
diff --git a/nbm/src/main/resources/META-INF/adito.version b/nbm/src/main/resources/META-INF/adito.version
index 73f2ea29..d3ef5aeb 100644
--- a/nbm/src/main/resources/META-INF/adito.version
+++ b/nbm/src/main/resources/META-INF/adito.version
@@ -1 +1 @@
-2020.2.1
\ No newline at end of file
+2020.2.2
\ No newline at end of file
diff --git a/nbm/src/nbm/manifest.mf b/nbm/src/nbm/manifest.mf
index 5a0f616b..97711bfa 100644
--- a/nbm/src/nbm/manifest.mf
+++ b/nbm/src/nbm/manifest.mf
@@ -6,6 +6,26 @@ OpenIDE-Module-Name: Git
OpenIDE-Module-Display-Category: ADITO / VCS
OpenIDE-Module-Long-Description: Git Support for NetBeans IDE.
Changelog
+ v.1.5.1
+ MAJOR
+
+ - Added the "Renormalize" functionality: This action makes it so all files have the lineending in the index that is determined by the gitattributes file. If a file has the wrong lineending in the index, just changing a line and committing does not fix that issue
+
+ MINOR
+
+ - Branches with unrelated histories may now be merged
+ - The plugin can now resolve conflicts where one side encloses the other
+ - It is now possible to remove remotes from the Config Dialog. The remotes are also only written to disk upon pressing the Save button instead of immediately after adding the remote
+
+ BUGFIXES
+
+ - Fix: The location of the ssh key to use and its passphrase is asked more than once when checking out a project via git
+ - Fix: If a wrong passphrase for a ssh key is stored, it does not get overriden when the user inserts the correct passphrase
+ - Fix: The merge conflict dialogs no longer ignore the setting for the newline treatment
+ - Fix: Potential Nullpointer when working with detached branches
+ - Fix: The "Resolve Conflicts" action does not try and resolve the first file in the list
+ - Fix: Error when retrieving the realm name for github addresses
+
v.1.5.0
MAJOR
diff --git a/pom.xml b/pom.xml
index a204079c..a57b972f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
de.adito.git
adito-nb-git
pom
- 1.5.0
+ 1.5.1
RELEASE90a