summaryrefslogtreecommitdiffstats
path: root/Documentation/config/merge.txt (unfollow)
Commit message (Expand)AuthorFilesLines
2024-06-17Merging debian version 1:2.45.2-1.Daniel Baumann11-824/+181
2024-06-17Merging upstream version 1:2.45.2.Daniel Baumann27-378/+205
2024-05-20Releasing progress-linux version 1:2.45.1-1~progress7.99u1.progress-linux/1%2.45.1-1_progress7.99u1Daniel Baumann1-0/+25
2024-05-20Merging debian version 1:2.45.1-1.Daniel Baumann12-19/+2716
2024-05-20Merging upstream version 1:2.45.1.Daniel Baumann908-19677/+41295
2024-04-12Releasing progress-linux version 1:2.43.0-1~progress7.99u1.progress-linux/1%2.43.0-1_progress7.99u1Daniel Baumann1-0/+23
2024-04-11Setting push.followTags to true.Daniel Baumann1-0/+3
2024-04-09Setting pull.rebase to true.Daniel Baumann1-0/+3
2024-04-09Adding dpkg-mergechangelogs merge driver for debian/changelog files.Daniel Baumann3-0/+9
2024-04-09Setting log.follow to true.Daniel Baumann1-0/+3
2024-04-09Setting init.defaultBranch to main.Daniel Baumann1-0/+3
2024-04-09Setting diff.wsErrorHighlight to all.Daniel Baumann1-0/+1
2024-04-09Setting diff.renames to copies.Daniel Baumann1-0/+3
2024-04-09Setting core.whitespace.Daniel Baumann1-0/+1
2024-04-09Setting core.autocrlf to false.Daniel Baumann1-0/+3
2024-04-09Setting color.ui to true.Daniel Baumann1-0/+3
2024-04-09Adding word difference aliases.Daniel Baumann1-0/+3
2024-04-09Adding log alias.Daniel Baumann1-0/+2
2024-04-09Adding git configuration file for Progress Linux.Daniel Baumann2-0/+3
2024-04-09Updating vcs fields.Daniel Baumann1-2/+4
2024-04-09Updating bugs field.Daniel Baumann1-0/+1
2024-04-09Updating uploaders field.Daniel Baumann1-1/+2
2024-04-09Updating maintainer field.Daniel Baumann1-1/+2
2024-04-09Adding debian version 1:2.43.0-1.debian/1%2.43.0-1Daniel Baumann66-0/+89055
2024-04-09Adding upstream version 1:2.43.0.upstream/1%2.43.0Daniel Baumann4413-0/+1451538
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 03:00:27 +0000