From b955415df92de8bdfa0d21c50d9a8d8aba9f8864 Mon Sep 17 00:00:00 2001 From: zleyyij Date: Wed, 23 Aug 2023 15:26:26 -0600 Subject: [PATCH] vault backup: 2023-08-23 15:26:26 --- The basics of Git.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/The basics of Git.md b/The basics of Git.md index 2918e83..6b3cc03 100644 --- a/The basics of Git.md +++ b/The basics of Git.md @@ -46,5 +46,7 @@ ### Merge local changes with remote changes `git stash` - Take any code that hasn't been committed, and save, before reverting back to the latest commit. -`git pull` +`git pull -r` - Fetch remote changes and apply them locally +`git stash pop` + - Take uncommitted changes, and apply them \ No newline at end of file