including infos about remotes, merging, stashing

ssh-juan · ssh-juan · commit 1648c0b2c536 · 2024-07-15T18:58:47.000-03:00
diff --git a/git-crash-course/readme.md b/git-crash-course/readme.md
@@ -103,10 +103,32 @@ git checkout {dev}
 
 ## Remotes
 
+We can add remotes but often you will just add remote via upstream when adding a branch.
+
+```ssh
+got remote add ...
+git branch -u origin new-feature
+```
+
 ## Stashing
 
+```
+git stash list
+git stash
+git stash save my-name
+git stash apply
+git stash pop
+```
+
+* NOT USE IN A CLOUD ENV, BECAUSE YOU CAN LOST DATA
+
 ## Merging
 
+```
+git checkout dev
+git merge main
+```
+
 ## Add
 
 When we want to stage changes that will be included in the commit.
