Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add commit message merge functionality [Wrong branch] #192

Closed
wants to merge 24 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a53d04c
Merge pull request #80 from se-passau/dev
clhunsen Dec 14, 2017
ea3d1c3
Merge pull request #83 from se-passau/dev
clhunsen Dec 20, 2017
8852caa
Merge pull request #88 from se-passau/dev
clhunsen Jan 23, 2018
0e90d61
Merge pull request #101 from se-passau/dev
bockthom Mar 1, 2018
34b9d35
Merge pull request #108 from se-passau/dev
clhunsen Mar 22, 2018
e077cb1
Merge pull request #114 from se-passau/dev
clhunsen Apr 6, 2018
cfadd76
Merge pull request #126 from se-passau/dev
clhunsen May 17, 2018
98de3e3
Merge pull request #139 from se-passau/dev
clhunsen Aug 12, 2018
83513c7
Merge pull request #144 from se-passau/dev
bockthom Oct 23, 2018
d02d523
Merge pull request #168 from se-passau/dev
clhunsen Jun 8, 2019
91fc448
Merge pull request #176 from se-passau/dev
bockthom Feb 21, 2020
a7f4123
Merge pull request #190 from se-sic/dev
bockthom Dec 2, 2020
68f1566
Add test commit message data
nlschn Dec 13, 2020
2d8df54
Add new function to read commit messages
nlschn Dec 13, 2020
796585d
Change commitMessages.list test files to account for the right line b…
nlschn Dec 16, 2020
c12c52f
Adapt commit message read test to new test files
nlschn Dec 16, 2020
a2e28d7
Adapt read.commit.messages to handle line breaks correctly
nlschn Dec 16, 2020
f254125
Add get.commit.messages function and modify set.commits to be able to…
nlschn Dec 21, 2020
6b7fbb6
Add new configuration option for commit messages
nlschn Dec 21, 2020
af692b8
Replace seq with seq_along and add missing log statement in util-read.R
nlschn Dec 21, 2020
c8b6a63
Add tests for commit message merging and fix bug when merging only ti…
nlschn Dec 28, 2020
95fc9d1
Add previous changes to NEWS.md
nlschn Dec 28, 2020
853a0b6
Move changes to "unversioned"
nlschn Dec 28, 2020
d6f5c2d
Resolve merge conflict in NEWS.md
nlschn Dec 28, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge pull request #83 from se-passau/dev
v3.0.1
clhunsen authored Dec 20, 2017
commit ea3d1c3831c8c68523fbd0bdb116c421eb34e41d

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.