From 9a080d718c83df950da7be1c32aa2be8c681e28c Mon Sep 17 00:00:00 2001 From: NataliaLKB Date: Sat, 28 Mar 2015 21:31:37 +0000 Subject: [PATCH 01/11] merging wth master --- cheatsheet.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cheatsheet.md b/cheatsheet.md index 5b70d53..23a8760 100644 --- a/cheatsheet.md +++ b/cheatsheet.md @@ -17,3 +17,21 @@ ##### Deleting a branch git branch -d + +##### Moving your changes to the staging area + git add + +##### Committing your changes + git commit -m '' + +##### Pushing your commit to the remote repository + git push origin + +##### Creating a branch and moving onto it. + git checkout -b + +##### Merging changes from another branch, to your current branch + git merge + +##### Pulling remote changes into your local repo + git pull origin From e0ee009e48014fdeb0ac50bea4a77af831f2e1ce Mon Sep 17 00:00:00 2001 From: Natalia Baltazar Date: Tue, 31 Mar 2015 09:34:07 +0100 Subject: [PATCH 02/11] Changing cheatsheet.md title --- cheatsheet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cheatsheet.md b/cheatsheet.md index 23a8760..98a1dc6 100644 --- a/cheatsheet.md +++ b/cheatsheet.md @@ -1,4 +1,4 @@ -# Git Command Cheat Sheet (separate this out) +# Git Command Cheat Sheet ##### Cloning your remote directory git clone From 7780e4a46bcea20438b6b5a9236f76da92b8b6e1 Mon Sep 17 00:00:00 2001 From: NataliaLKB Date: Tue, 31 Mar 2015 12:56:13 +0100 Subject: [PATCH 03/11] reverting back cheatsheet to try to create merge conflicts --- cheatsheet.md | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/cheatsheet.md b/cheatsheet.md index d8aa9a4..5ba7629 100644 --- a/cheatsheet.md +++ b/cheatsheet.md @@ -1,19 +1,37 @@ # Git Command Cheat Sheet ##### Cloning your remote directory - git clone + git clone ##### Checking that status of your local repository - git status + git status ##### Pulling down all branches in a remote repo, not just the default branch - git fetch --all + git fetch --all ##### Creating a new branch for you to work on - git branch + git branch ##### Moving onto a branch - git checkout + git checkout ##### Deleting a branch - git branch -d + git branch -d + +##### Moving your changes to the staging area + git add + +##### ommitting your changes + git commit -m '' + +##### Pushing your commit to the remote repository + git push origin + +##### Creating a branch and moving onto it. + git checkout -b + +##### Merging changes from another branch, to your current branch + git merge + +##### Pulling remote changes into your local repo + git pull origin From a2788f5287b8cea9b90a654c208bcc246046fc4f Mon Sep 17 00:00:00 2001 From: m_banaszynski Date: Wed, 7 Jul 2021 10:28:10 +0200 Subject: [PATCH 04/11] adding files --- index.html | 0 script.js | 0 stylesheet.css | 0 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 index.html create mode 100644 script.js create mode 100644 stylesheet.css diff --git a/index.html b/index.html new file mode 100644 index 0000000..e69de29 diff --git a/script.js b/script.js new file mode 100644 index 0000000..e69de29 diff --git a/stylesheet.css b/stylesheet.css new file mode 100644 index 0000000..e69de29 From c99740193d2b2aaa37339b2f08cb65e61e2bb3fd Mon Sep 17 00:00:00 2001 From: m_banaszynski Date: Wed, 7 Jul 2021 10:33:19 +0200 Subject: [PATCH 05/11] adding destination folders and move the files --- stylesheet.css => css/stylesheet.css | 0 script.js => js/script.js | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename stylesheet.css => css/stylesheet.css (100%) rename script.js => js/script.js (100%) diff --git a/stylesheet.css b/css/stylesheet.css similarity index 100% rename from stylesheet.css rename to css/stylesheet.css diff --git a/script.js b/js/script.js similarity index 100% rename from script.js rename to js/script.js From 4c024e49bd4de0f9f562af183dbbf549ef06be56 Mon Sep 17 00:00:00 2001 From: m_banaszynski Date: Wed, 7 Jul 2021 11:06:31 +0200 Subject: [PATCH 06/11] add first message --- newfile.txt | 1 + time/newfile.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 newfile.txt create mode 100644 time/newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 0000000..68cfd49 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +Hey, I'm doing some epic stuff!!! :P \ No newline at end of file diff --git a/time/newfile.txt b/time/newfile.txt new file mode 100644 index 0000000..20a32d2 --- /dev/null +++ b/time/newfile.txt @@ -0,0 +1 @@ +Hey, I'm making some progress. \ No newline at end of file From 7757ae8e166903d5645fe9f6e937fd600b489d6e Mon Sep 17 00:00:00 2001 From: m_banaszynski Date: Wed, 7 Jul 2021 11:08:59 +0200 Subject: [PATCH 07/11] adding second message --- time/newfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time/newfile.txt b/time/newfile.txt index 20a32d2..e61827a 100644 --- a/time/newfile.txt +++ b/time/newfile.txt @@ -1 +1 @@ -Hey, I'm making some progress. \ No newline at end of file +Hey it's my second time stamp! \ No newline at end of file From 6386dc46a5b23580a3f6f64dd471b4703cc72efd Mon Sep 17 00:00:00 2001 From: m_banaszynski Date: Wed, 7 Jul 2021 11:10:09 +0200 Subject: [PATCH 08/11] adding third message --- time/newfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time/newfile.txt b/time/newfile.txt index e61827a..2425c40 100644 --- a/time/newfile.txt +++ b/time/newfile.txt @@ -1 +1 @@ -Hey it's my second time stamp! \ No newline at end of file +Hey, its my third message! From f5f58a3167a841911856704197b22edc28723d57 Mon Sep 17 00:00:00 2001 From: m_banaszynski Date: Wed, 7 Jul 2021 11:28:32 +0200 Subject: [PATCH 09/11] first commit --- newfile.txt | 1 - time/newfile.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt deleted file mode 100644 index 68cfd49..0000000 --- a/newfile.txt +++ /dev/null @@ -1 +0,0 @@ -Hey, I'm doing some epic stuff!!! :P \ No newline at end of file diff --git a/time/newfile.txt b/time/newfile.txt index 2425c40..dd95f3f 100644 --- a/time/newfile.txt +++ b/time/newfile.txt @@ -1 +1 @@ -Hey, its my third message! +Hey its my 1 time! \ No newline at end of file From 99e3bef85ed740f3ac88d3cdae3b78e51672de5d Mon Sep 17 00:00:00 2001 From: m_banaszynski Date: Wed, 7 Jul 2021 11:29:47 +0200 Subject: [PATCH 10/11] second commit --- time/newfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time/newfile.txt b/time/newfile.txt index dd95f3f..2792790 100644 --- a/time/newfile.txt +++ b/time/newfile.txt @@ -1 +1 @@ -Hey its my 1 time! \ No newline at end of file +Hey its my 2 time! \ No newline at end of file From 3f8a0d7dfd84ac1b1ddadecb88e487e88bfacd95 Mon Sep 17 00:00:00 2001 From: m_banaszynski Date: Wed, 7 Jul 2021 11:31:18 +0200 Subject: [PATCH 11/11] third commit --- time/newfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time/newfile.txt b/time/newfile.txt index 2792790..08b9297 100644 --- a/time/newfile.txt +++ b/time/newfile.txt @@ -1 +1 @@ -Hey its my 2 time! \ No newline at end of file +Hey its my 3 time! \ No newline at end of file