@matheusbsbs / matheus-bagliano
Code Commits Pulls CI/CD 81,348
maint
bisect jch maint master next seen test todo
parallel-change-f-to-main 166 lines 2.42 KB
Raw
1 commit 0469c60bc4837d52d97b1f081dec5f98dea20fed
2 Merge: ba227c6 6ce3c4f
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 6ce3c4ff690136099bb17e1a8766b75764726ea7
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 5de3ea4..bf79c2f 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 ba227c6632349700fbb957dec2b50f5e2358be3f
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 5de3ea4..01b5b65 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 39b6eb2d5b706d3322184a169f666f25ed3fbd00
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 e51de13..bdb2bb1 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 a6eb82647d5d67f893da442f8f9375fd89a3b1e2
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 3233403..e51de13 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 f04fb20f2c77850996cba739709acc6faecc58f7
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 444e415..3233403 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 de4c48ae814792c02a49c4c3c0c757ae69c55f6a
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..444e415
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 +