@leroysheep / Socializer
Code Commits Pulls CI/CD 82,027
next
bisect jch maint master next seen test todo
parallel-change-f-to-main 166 lines 2.58 KB
Raw
1 commit 98117c2059b76c36995748fb97b02542aef477fe26379e94c18fd70f7790bc67
2 Merge: b511694 4f7a581
3 Author: Thomas Rast <trast@inf.ethz.ch>
4 Date: Fri Apr 12 16:16:24 2013 +0200
5
6 Merge across the rename
7
8 commit 4f7a58195a92c400e28a2354328587f1ff14fb77f5cf894536f17ccbc72931b9
9 Author: Thomas Rast <trast@student.ethz.ch>
10 Date: Thu Feb 28 10:49:50 2013 +0100
11
12 another simple change
13
14 diff --git a/b.c b/b.c
15 index 62c1fc2..69cb69c 100644
16 --- a/b.c
17 +++ b/b.c
18 @@ -4,14 +4,14 @@
19 long f(long x)
20 {
21 int s = 0;
22 while (x) {
23 - x >>= 1;
24 + x /= 2;
25 s++;
26 }
27 return s;
28 }
29
30 /*
31 * This is only an example!
32 */
33
34
35 commit b511694f5337663fbd697622993a5f8e1099eca84be4df313f2b3ee94a098b42
36 Author: Thomas Rast <trast@inf.ethz.ch>
37 Date: Fri Apr 12 16:15:57 2013 +0200
38
39 change on another line of history while rename happens
40
41 diff --git a/a.c b/a.c
42 index 62c1fc2..e1e8475 100644
43 --- a/a.c
44 +++ b/a.c
45 @@ -4,14 +4,14 @@
46 long f(long x)
47 {
48 int s = 0;
49 while (x) {
50 x >>= 1;
51 s++;
52 }
53 return s;
54 }
55
56 /*
57 - * This is only an example!
58 + * This is only a short example!
59 */
60
61
62 commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca
63 Author: Thomas Rast <trast@student.ethz.ch>
64 Date: Thu Feb 28 10:45:41 2013 +0100
65
66 touch comment
67
68 diff --git a/a.c b/a.c
69 index 75c0119..3a78aaf 100644
70 --- a/a.c
71 +++ b/a.c
72 @@ -3,14 +3,14 @@
73 long f(long x)
74 {
75 int s = 0;
76 while (x) {
77 x >>= 1;
78 s++;
79 }
80 return s;
81 }
82
83 /*
84 - * A comment.
85 + * This is only an example!
86 */
87
88
89 commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
90 Author: Thomas Rast <trast@student.ethz.ch>
91 Date: Thu Feb 28 10:45:16 2013 +0100
92
93 touch both functions
94
95 diff --git a/a.c b/a.c
96 index 7a296b9..75c0119 100644
97 --- a/a.c
98 +++ b/a.c
99 @@ -3,14 +3,14 @@
100 -int f(int x)
101 +long f(long x)
102 {
103 int s = 0;
104 while (x) {
105 x >>= 1;
106 s++;
107 }
108 return s;
109 }
110
111 /*
112 * A comment.
113 */
114
115
116 commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
117 Author: Thomas Rast <trast@student.ethz.ch>
118 Date: Thu Feb 28 10:44:55 2013 +0100
119
120 change f()
121
122 diff --git a/a.c b/a.c
123 index 9f550c3..7a296b9 100644
124 --- a/a.c
125 +++ b/a.c
126 @@ -3,13 +3,14 @@
127 int f(int x)
128 {
129 int s = 0;
130 while (x) {
131 x >>= 1;
132 s++;
133 }
134 + return s;
135 }
136
137 /*
138 * A comment.
139 */
140
141
142 commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
143 Author: Thomas Rast <trast@student.ethz.ch>
144 Date: Thu Feb 28 10:44:48 2013 +0100
145
146 initial
147
148 diff --git a/a.c b/a.c
149 new file mode 100644
150 index 0000000..9f550c3
151 --- /dev/null
152 +++ b/a.c
153 @@ -0,0 +3,13 @@
154 +int f(int x)
155 +{
156 + int s = 0;
157 + while (x) {
158 + x >>= 1;
159 + s++;
160 + }
161 +}
162 +
163 +/*
164 + * A comment.
165 + */
166 +