master
simple-f-to-main 105 lines 1.43 KB
Raw
1 commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
2 Author: Thomas Rast <trast@student.ethz.ch>
3 Date: Thu Feb 28 10:45:41 2013 +0100
4
5 touch comment
6
7 diff --git a/a.c b/a.c
8 index e51de13..bdb2bb1 100644
9 --- a/a.c
10 +++ b/a.c
11 @@ -3,14 +3,14 @@
12 long f(long x)
13 {
14 int s = 0;
15 while (x) {
16 x >>= 1;
17 s++;
18 }
19 return s;
20 }
21
22 /*
23 - * A comment.
24 + * This is only an example!
25 */
26
27
28 commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
29 Author: Thomas Rast <trast@student.ethz.ch>
30 Date: Thu Feb 28 10:45:16 2013 +0100
31
32 touch both functions
33
34 diff --git a/a.c b/a.c
35 index 3233403..e51de13 100644
36 --- a/a.c
37 +++ b/a.c
38 @@ -3,14 +3,14 @@
39 -int f(int x)
40 +long f(long x)
41 {
42 int s = 0;
43 while (x) {
44 x >>= 1;
45 s++;
46 }
47 return s;
48 }
49
50 /*
51 * A comment.
52 */
53
54
55 commit f04fb20f2c77850996cba739709acc6faecc58f7
56 Author: Thomas Rast <trast@student.ethz.ch>
57 Date: Thu Feb 28 10:44:55 2013 +0100
58
59 change f()
60
61 diff --git a/a.c b/a.c
62 index 444e415..3233403 100644
63 --- a/a.c
64 +++ b/a.c
65 @@ -3,13 +3,14 @@
66 int f(int x)
67 {
68 int s = 0;
69 while (x) {
70 x >>= 1;
71 s++;
72 }
73 + return s;
74 }
75
76 /*
77 * A comment.
78 */
79
80
81 commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
82 Author: Thomas Rast <trast@student.ethz.ch>
83 Date: Thu Feb 28 10:44:48 2013 +0100
84
85 initial
86
87 diff --git a/a.c b/a.c
88 new file mode 100644
89 index 0000000..444e415
90 --- /dev/null
91 +++ b/a.c
92 @@ -0,0 +3,13 @@
93 +int f(int x)
94 +{
95 + int s = 0;
96 + while (x) {
97 + x >>= 1;
98 + s++;
99 + }
100 +}
101 +
102 +/*
103 + * A comment.
104 + */
105 +