From 62c4c27118875fb3fb5a2fd802e3b51e7ea8275c Mon Sep 17 00:00:00 2001 From: sagar-wal Date: Thu, 12 Sep 2019 20:02:51 +0530 Subject: [PATCH 01/10] Details --- main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.c b/main.c index f599418..c8c7a68 100644 --- a/main.c +++ b/main.c @@ -1,2 +1,4 @@ int i = 0; int a = 5; +// Sagar Agarwal 19D80027 8400700448 sagaragarwal612@gmail.com + From 136cd1562973d251d431ebe7dfde0c643ba82be6 Mon Sep 17 00:00:00 2001 From: sagar-wal Date: Thu, 12 Sep 2019 20:07:27 +0530 Subject: [PATCH 02/10] #33 resolved --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index c8c7a68..d9a87a4 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ int i = 0; int a = 5; -// Sagar Agarwal 19D80027 8400700448 sagaragarwal612@gmail.com +// Sagar Agarwal 19D80027 8400700448 Email-sagaragarwal612@gmail.com From 930bc3251cfec4508d74518099256e365ca32480 Mon Sep 17 00:00:00 2001 From: sagar-wal Date: Tue, 1 Oct 2019 00:40:43 +0530 Subject: [PATCH 03/10] Created file --- calculator.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 calculator.cpp diff --git a/calculator.cpp b/calculator.cpp new file mode 100644 index 0000000..e69de29 From a0bab06f001a21a5fe948c2fba1693b713ec45fe Mon Sep 17 00:00:00 2001 From: sagar-wal Date: Tue, 1 Oct 2019 01:00:28 +0530 Subject: [PATCH 04/10] Added add function --- calculator.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/calculator.cpp b/calculator.cpp index e69de29..0e4b108 100644 --- a/calculator.cpp +++ b/calculator.cpp @@ -0,0 +1,8 @@ +#include +using namespace std; +void add(int a, int b) +{ + int c=a+b; + cout<<"Sum of 2 numbers "< Date: Tue, 1 Oct 2019 01:33:45 +0530 Subject: [PATCH 05/10] Update calculator.cpp --- calculator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calculator.cpp b/calculator.cpp index 0e4b108..1bd1689 100644 --- a/calculator.cpp +++ b/calculator.cpp @@ -1,6 +1,6 @@ #include using namespace std; -void add(int a, int b) +void add(int a, int b) // function to add two numbers { int c=a+b; cout<<"Sum of 2 numbers "< Date: Tue, 1 Oct 2019 02:01:05 +0530 Subject: [PATCH 06/10] Subtraction funcion --- calculator.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/calculator.cpp b/calculator.cpp index 0e4b108..427b169 100644 --- a/calculator.cpp +++ b/calculator.cpp @@ -6,3 +6,9 @@ void add(int a, int b) cout<<"Sum of 2 numbers "< Date: Tue, 1 Oct 2019 02:18:21 +0530 Subject: [PATCH 07/10] product func --- calculator.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/calculator.cpp b/calculator.cpp index 4ce5557..5b57bdd 100644 --- a/calculator.cpp +++ b/calculator.cpp @@ -12,3 +12,8 @@ void sub(int a, int b) cout<<"Difference of 2 numbers "< Date: Fri, 4 Oct 2019 21:58:26 +0530 Subject: [PATCH 08/10] Create README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..cbc482f --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# gitworkshop + +This repository was created as a sample repository for the 2019 Git Workshop. From 17f8e073532f5724d95e57491e101bfa0e44b2f4 Mon Sep 17 00:00:00 2001 From: Sagar Agarwal Date: Fri, 4 Oct 2019 22:00:01 +0530 Subject: [PATCH 09/10] Delete main.c --- main.c | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 main.c diff --git a/main.c b/main.c deleted file mode 100644 index d9a87a4..0000000 --- a/main.c +++ /dev/null @@ -1,4 +0,0 @@ -int i = 0; -int a = 5; -// Sagar Agarwal 19D80027 8400700448 Email-sagaragarwal612@gmail.com - From cba94c227cfbb89cb7665c4f47c9f5003b1674c6 Mon Sep 17 00:00:00 2001 From: Sagar Agarwal Date: Fri, 4 Oct 2019 22:01:19 +0530 Subject: [PATCH 10/10] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cbc482f..822c285 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # gitworkshop + This repository was created as a sample repository for the 2019 Git Workshop.