Skip to content

Commit a0fe3a9

Browse files
committed
Fixing merge commits... again...
1 parent 27bbef6 commit a0fe3a9

11 files changed

+71
-44
lines changed

CHANGELOG.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
Changelog of Git Changelog Maven plugin.
44

5+
## Unreleased
6+
### No issue
7+
8+
**doc**
9+
10+
11+
[27bbef6d740b133](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/27bbef6d740b133) Tomas Bjerre *2016-06-24 09:31:53*
12+
13+
514
## 1.32
615
### No issue
716

@@ -507,9 +516,4 @@ Changelog of Git Changelog Maven plugin.
507516

508517
[044b3a76a1ab650](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/044b3a76a1ab650) Tomas Bjerre *2015-11-15 14:30:51*
509518

510-
**Initial commit**
511-
512-
513-
[3c47076c0ecb2de](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/3c47076c0ecb2de) Tomas Bjerre *2015-11-15 13:18:29*
514-
515519

git-changelog-maven-plugin-example/CHANGELOG.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
Changelog of Git Changelog Maven plugin.
44

5+
## Unreleased
6+
### No issue
7+
8+
**doc**
9+
10+
11+
[27bbef6d740b133](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/27bbef6d740b133) Tomas Bjerre *2016-06-24 09:31:53*
12+
13+
514
## 1.32
615
### No issue
716

@@ -507,9 +516,4 @@ Changelog of Git Changelog Maven plugin.
507516

508517
[044b3a76a1ab650](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/044b3a76a1ab650) Tomas Bjerre *2015-11-15 14:30:51*
509518

510-
**Initial commit**
511-
512-
513-
[3c47076c0ecb2de](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/3c47076c0ecb2de) Tomas Bjerre *2015-11-15 13:18:29*
514-
515519

git-changelog-maven-plugin-example/CHANGELOG_1_1.md

-5
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,4 @@ Changelog of Git Changelog Maven plugin.
2929

3030
[044b3a76a1ab650](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/044b3a76a1ab650) Tomas Bjerre *2015-11-15 14:30:51*
3131

32-
**Initial commit**
33-
34-
35-
[3c47076c0ecb2de](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/3c47076c0ecb2de) Tomas Bjerre *2015-11-15 13:18:29*
36-
3732

git-changelog-maven-plugin-example/CHANGELOG_custom.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
Changelog of Git Changelog Maven plugin.
44

5+
## Unreleased
6+
### No issue /
7+
doc
8+
9+
10+
511
## git-changelog-maven-plugin-1.32
612
### No issue /
713
Including commits from merges lib issue 49
@@ -292,7 +298,5 @@ Changelog of Git Changelog Maven plugin.
292298

293299
Initial
294300

295-
Initial commit
296-
297301

298302

git-changelog-maven-plugin-example/CHANGELOG_inline.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
Changelog of Git Changelog Maven plugin.
44

5+
## Unreleased
6+
### No issue
7+
8+
[27bbef6d740b133](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/27bbef6d740b133) Tomas Bjerre *2016-06-24 09:31:53*
9+
10+
doc
11+
12+
513
## git-changelog-maven-plugin-1.32
614
### No issue
715

@@ -420,8 +428,4 @@ doc
420428

421429
Initial
422430

423-
[3c47076c0ecb2de](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/3c47076c0ecb2de) Tomas Bjerre *2015-11-15 13:18:29*
424-
425-
Initial commit
426-
427431

git-changelog-maven-plugin-example/CHANGELOG_jira.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
Changelog of Git Changelog Maven plugin.
44

5+
## Unreleased
6+
### No issue
7+
8+
**doc**
9+
10+
11+
[27bbef6d740b133](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/27bbef6d740b133) Tomas Bjerre *2016-06-24 09:31:53*
12+
13+
514
## 1.32
615
### No issue
716

@@ -486,9 +495,4 @@ Changelog of Git Changelog Maven plugin.
486495

487496
[044b3a76a1ab650](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/044b3a76a1ab650) Tomas Bjerre *2015-11-15 14:30:51*
488497

489-
**Initial commit**
490-
491-
492-
[3c47076c0ecb2de](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/3c47076c0ecb2de) Tomas Bjerre *2015-11-15 13:18:29*
493-
494498

git-changelog-maven-plugin-example/CHANGELOG_minimal.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
Changelog of Git Changelog Maven plugin.
44

5+
## Unreleased
6+
### No issue
7+
8+
**doc**
9+
10+
11+
[27bbef6d740b133](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/27bbef6d740b133) Tomas Bjerre *2016-06-24 09:31:53*
12+
13+
514
## git-changelog-maven-plugin-1.32
615
### No issue
716

@@ -486,9 +495,4 @@ Changelog of Git Changelog Maven plugin.
486495

487496
[044b3a76a1ab650](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/044b3a76a1ab650) Tomas Bjerre *2015-11-15 14:30:51*
488497

489-
**Initial commit**
490-
491-
492-
[3c47076c0ecb2de](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/3c47076c0ecb2de) Tomas Bjerre *2015-11-15 13:18:29*
493-
494498

git-changelog-maven-plugin-example/CHANGELOG_mixed.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Changelog of Git Changelog Maven plugin.
88

99

1010
### These commits have not issue in their commit comment
11+
doc *09:31:53*
12+
1113
Including commits from merges lib issue 49 *09:29:14*
1214

1315
doc *19:07:44*
@@ -192,7 +194,5 @@ Changelog of Git Changelog Maven plugin.
192194

193195
Initial *14:30:51*
194196

195-
Initial commit *13:18:29*
196-
197197

198198

git-changelog-maven-plugin-example/CHANGELOG_settings.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
Changelog of Git Changelog Maven plugin.
44

5+
## Next release
6+
### Other changes
7+
8+
**doc**
9+
10+
11+
[27bbef6d740b133](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/27bbef6d740b133) Tomas Bjerre *2016-06-24 09:31:53*
12+
13+
514
## 1.32
615
### Other changes
716

@@ -507,9 +516,4 @@ Changelog of Git Changelog Maven plugin.
507516

508517
[044b3a76a1ab650](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/044b3a76a1ab650) Tomas Bjerre *2015-11-15 14:30:51*
509518

510-
**Initial commit**
511-
512-
513-
[3c47076c0ecb2de](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/3c47076c0ecb2de) Tomas Bjerre *2015-11-15 13:18:29*
514-
515519

git-changelog-maven-plugin-example/CHANGELOG_templatefile.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
Changelog of Git Changelog Maven plugin.
44

5+
## Unreleased
6+
### No issue
7+
8+
**doc**
9+
10+
11+
[27bbef6d740b133](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/27bbef6d740b133) Tomas Bjerre *2016-06-24 09:31:53*
12+
13+
514
## 1.32
615
### No issue
716

@@ -486,9 +495,4 @@ Changelog of Git Changelog Maven plugin.
486495

487496
[044b3a76a1ab650](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/044b3a76a1ab650) Tomas Bjerre *2015-11-15 14:30:51*
488497

489-
**Initial commit**
490-
491-
492-
[3c47076c0ecb2de](https://github.com/tomasbjerre/git-changelog-maven-plugin/commit/3c47076c0ecb2de) Tomas Bjerre *2015-11-15 13:18:29*
493-
494498

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>se.bjurr.gitchangelog</groupId>
7171
<artifactId>git-changelog-lib</artifactId>
72-
<version>1.50</version>
72+
<version>1.52</version>
7373
</dependency>
7474
</dependencies>
7575

0 commit comments

Comments
 (0)