From 6daa8ba5fb5edfb4abf04a41e86f3a7e8e348ba5 Mon Sep 17 00:00:00 2001 From: abdulsenlik <71569381+abdulsenlik@users.noreply.github.com> Date: Thu, 24 Sep 2020 14:40:41 -0500 Subject: [PATCH 1/9] Delete DELETEME.txt --- DELETEME.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 DELETEME.txt diff --git a/DELETEME.txt b/DELETEME.txt deleted file mode 100644 index 78695feb..00000000 --- a/DELETEME.txt +++ /dev/null @@ -1 +0,0 @@ -Make sure you delete this file. From 6ec0b0b8ad80a4ae5fd7c7f9039fc001d7f47fbe Mon Sep 17 00:00:00 2001 From: abdulsenlik <71569381+abdulsenlik@users.noreply.github.com> Date: Thu, 24 Sep 2020 14:41:25 -0500 Subject: [PATCH 2/9] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 834291b3..cbcf197f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +Name: Abdulkadir Senlik +NetID: axs180014@utdallas.edu # Assignment 1 Example repository In this assignment you will perform a series of basic Git actions to get you familiarized with the basics. From e637191845e44222ff94bdd9a20d4135091c4cd8 Mon Sep 17 00:00:00 2001 From: abdulsenlik <71569381+abdulsenlik@users.noreply.github.com> Date: Thu, 24 Sep 2020 14:42:23 -0500 Subject: [PATCH 3/9] Update README.md The information files have been modified to better reflect the owner of the repository. Added repository owner information to README.md and deleted DELETEME.txt --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cbcf197f..73985430 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ Name: Abdulkadir Senlik NetID: axs180014@utdallas.edu + # Assignment 1 Example repository In this assignment you will perform a series of basic Git actions to get you familiarized with the basics. From 2abab8c2771d1e072e8414ee6a275429b95e1e44 Mon Sep 17 00:00:00 2001 From: abdulsenlik <71569381+abdulsenlik@users.noreply.github.com> Date: Thu, 24 Sep 2020 14:55:54 -0500 Subject: [PATCH 4/9] Create status.txt --- status.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 status.txt diff --git a/status.txt b/status.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/status.txt @@ -0,0 +1 @@ + From b47f7935bdfab05b68d71672f17e8f33bb30728a Mon Sep 17 00:00:00 2001 From: abdulsenlik <71569381+abdulsenlik@users.noreply.github.com> Date: Thu, 24 Sep 2020 15:02:52 -0500 Subject: [PATCH 5/9] Update status.txt --- status.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/status.txt b/status.txt index 8b137891..a8378259 100644 --- a/status.txt +++ b/status.txt @@ -1 +1,8 @@ +Abduls-MBP-2:~ abdulsenlik$ git --status +Unknown option: --status +usage: git [--version] [--help] [-C ] [-c name=value] + [--exec-path[=]] [--html-path] [--man-path] [--info-path] + [-p | --paginate | --no-pager] [--no-replace-objects] [--bare] + [--git-dir=] [--work-tree=] [--namespace=] + [] From 9bd8dfda8ad113c5a275ade2eea7ef7a6b0b28d3 Mon Sep 17 00:00:00 2001 From: abdulsenlik <71569381+abdulsenlik@users.noreply.github.com> Date: Thu, 24 Sep 2020 15:27:16 -0500 Subject: [PATCH 6/9] Create answers.txt --- answers.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 answers.txt diff --git a/answers.txt b/answers.txt new file mode 100644 index 00000000..ce1cc00f --- /dev/null +++ b/answers.txt @@ -0,0 +1,17 @@ +(a) How many commits exist in the repository history after completing step 8 (Including commits made by the original author)? +5 commits exist in the repository history after completing step 8. + +(b) When was the file .gitignore added? +.gitignore file was added four years ago. + +(c) What is the difference between git log and git status? +Git log shows the repository history while git status shows the current working directory and the staging area. + +(d) What is the difference between unstaged and untracked files? +Untracked files are not on git while unstaged files are on git but are not marked for commit. + +(e) What is the difference between git checkout and git reset? +Git Resset is specifically used for upadating the index while git checkout is for updating the working tree directly. + +(f) What happens if you try to pull remote changes when there are uncommitted changes in your working directory? +Git will give the following error message so you do not loose any vital code : "Cannot checkout as your working directory has uncommitted changes " From 3c0d8884c6e66d312e5ae017d55537eebe3994db Mon Sep 17 00:00:00 2001 From: abdulsenlik <71569381+abdulsenlik@users.noreply.github.com> Date: Thu, 24 Sep 2020 15:27:50 -0500 Subject: [PATCH 7/9] Update answers.txt --- answers.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/answers.txt b/answers.txt index ce1cc00f..9efbc8de 100644 --- a/answers.txt +++ b/answers.txt @@ -1,5 +1,5 @@ (a) How many commits exist in the repository history after completing step 8 (Including commits made by the original author)? -5 commits exist in the repository history after completing step 8. +12 commits exist in the repository history after completing step 8. (b) When was the file .gitignore added? .gitignore file was added four years ago. From a4d6907cb72dd91befd1a0d1fc87fd3a6c93f2f9 Mon Sep 17 00:00:00 2001 From: abdulsenlik <71569381+abdulsenlik@users.noreply.github.com> Date: Thu, 24 Sep 2020 15:41:07 -0500 Subject: [PATCH 8/9] Update Main.java --- Adder/src/adder/Main.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Adder/src/adder/Main.java b/Adder/src/adder/Main.java index 6fe76933..6d8c1166 100644 --- a/Adder/src/adder/Main.java +++ b/Adder/src/adder/Main.java @@ -11,7 +11,10 @@ public static void main(String[] args) { } } + private static int addArguments(String[] args) { - return Integer.valueOf(args[0]) + Integer.valueOf(args[1]); - } + int sum=Integer.parseInt(args[0]) + Integer.parseInt(args[1]); + for(int i=2;i Date: Thu, 24 Sep 2020 15:51:09 -0500 Subject: [PATCH 9/9] Update Main.java --- Adder/src/adder/Main.java | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Adder/src/adder/Main.java b/Adder/src/adder/Main.java index 6d8c1166..da9471c9 100644 --- a/Adder/src/adder/Main.java +++ b/Adder/src/adder/Main.java @@ -12,9 +12,20 @@ public static void main(String[] args) { } - private static int addArguments(String[] args) { - int sum=Integer.parseInt(args[0]) + Integer.parseInt(args[1]); - for(int i=2;i