summaryrefslogtreecommitdiffstats
path: root/mergetools/emerge (unfollow)
Commit message (Collapse)AuthorFilesLines
2024-04-11Setting push.followTags to true.Daniel Baumann1-0/+3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Setting pull.rebase to true.Daniel Baumann1-0/+3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Adding dpkg-mergechangelogs merge driver for debian/changelog files.Daniel Baumann3-0/+9
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Setting log.follow to true.Daniel Baumann1-0/+3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Setting init.defaultBranch to main.Daniel Baumann1-0/+3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Setting diff.wsErrorHighlight to all.Daniel Baumann1-0/+1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Setting diff.renames to copies.Daniel Baumann1-0/+3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Setting core.whitespace.Daniel Baumann1-0/+1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Setting core.autocrlf to false.Daniel Baumann1-0/+3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Setting color.ui to true.Daniel Baumann1-0/+3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Adding word difference aliases.Daniel Baumann1-0/+3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Adding log alias.Daniel Baumann1-0/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Adding git configuration file for Progress Linux.Daniel Baumann2-0/+3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Updating vcs fields.Daniel Baumann1-2/+4
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Updating bugs field.Daniel Baumann1-0/+1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Updating uploaders field.Daniel Baumann1-1/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Updating maintainer field.Daniel Baumann1-1/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Adding debian version 1:2.39.2-1.1.debian/1%2.39.2-1.1debianDaniel Baumann69-0/+85895
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-07Adding upstream version 1:2.39.2.upstream/1%2.39.2upstreamDaniel Baumann4319-0/+1403143
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>