From 902fc3f0fbbdf73225a12d5a4d6ace12e08d83b1 Mon Sep 17 00:00:00 2001 From: Fire Date: Tue, 16 Apr 2024 21:02:11 +0100 Subject: [PATCH 1/3] deleting command in cheatsheet --- cheatsheet.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/cheatsheet.md b/cheatsheet.md index 98fb3eb..b7e2e7e 100644 --- a/cheatsheet.md +++ b/cheatsheet.md @@ -20,6 +20,3 @@ ##### Moving files while preserving git history git mv - -##### Creates a branch, and moves you onto it AT THE SAME TIME - git checkout -b From db5b7dfde3c8ddad25e0830a02aadd79d266b62d Mon Sep 17 00:00:00 2001 From: Fire Date: Tue, 16 Apr 2024 21:04:19 +0100 Subject: [PATCH 2/3] added 2 new commands --- cheatsheet.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cheatsheet.md b/cheatsheet.md index b7e2e7e..4b69110 100644 --- a/cheatsheet.md +++ b/cheatsheet.md @@ -20,3 +20,12 @@ ##### Moving files while preserving git history git mv + +##### Creates a branch, and moves you onto it AT THE SAME TIME + git checkout -b + +##### Moves changes to staging + git add + +##### Commits changes + git commit -m 'explanation of change' \ No newline at end of file From c497e6682ffcd1f13b5c0efc24d3cddc4c8b85a0 Mon Sep 17 00:00:00 2001 From: Fire Date: Tue, 16 Apr 2024 21:07:29 +0100 Subject: [PATCH 3/3] added merging instructions --- cheatsheet.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cheatsheet.md b/cheatsheet.md index 4b69110..21a7fcf 100644 --- a/cheatsheet.md +++ b/cheatsheet.md @@ -28,4 +28,10 @@ git add ##### Commits changes - git commit -m 'explanation of change' \ No newline at end of file + git commit -m 'explanation of change' + +##### To merge with master + git checkout master + git pull origin master + git checkout update-cheatsheet + git merge master \ No newline at end of file