File: degenerate-evil-merge

package info (click to toggle)
git-filter-repo 2.47.0-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 1,280 kB
  • sloc: sh: 4,887; python: 4,856; makefile: 114
file content (81 lines) | stat: -rw-r--r-- 1,640 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
feature done
blob
mark :1
data 0

reset refs/heads/master
commit refs/heads/master
mark :2
author Full Name <user@organization.tld> 2000000000 +0100
committer Full Name <user@organization.tld> 2000000000 +0100
data 2
A
M 100644 :1 irrelevant
M 100644 :1 module-of-interest/file1
M 100644 :1 module-of-interest/file2
M 100644 :1 module-of-interest/file3
M 100644 :1 other-module/files
M 100644 :1 other-module/are
M 100644 :1 other-module/fun

commit refs/heads/master
mark :3
author Full Name <user@organization.tld> 2000030000 +0100
committer Full Name <user@organization.tld> 2000030000 +0100
data 2
B
from :2
D irrelevant
D module-of-interest/file1
D module-of-interest/file2
D module-of-interest/file3

blob
mark :4
data 8
content

commit refs/heads/master
mark :5
author Full Name <user@organization.tld> 2000040000 +0100
committer Full Name <user@organization.tld> 2000040000 +0100
data 2
D
from :3
M 100644 :4 other-module/fun

commit refs/heads/master
mark :6
author Full Name <user@organization.tld> 2000020000 +0100
committer Full Name <user@organization.tld> 2000020000 +0100
data 2
C
from :2
M 100644 :4 irrelevant

commit refs/heads/master
mark :7
author Full Name <user@organization.tld> 2000050000 +0100
committer Full Name <user@organization.tld> 2000050000 +0100
data 31
Merge and ignore the deletions
from :6
merge :5
M 100644 :4 irrelevant
M 100644 :4 other-module/fun

blob
mark :8
data 6
final

commit refs/heads/master
mark :7
author Full Name <user@organization.tld> 2000060000 +0100
committer Full Name <user@organization.tld> 2000060000 +0100
data 13
Final change
from :7
M 100644 :8 module-of-interest/file2

done