Differences

This shows you the differences between two versions of the page.

--- git [2023/07/04 14:30] – [Disable https ssl verification] odefta
+++ git [2023/11/28 23:35] (current) – [Sync fork with original repo] odefta
@@ Line 25: / Line 25: @@
   git config --global http.sslVerify false
+====== Sync fork with original repo ======
+<code>
+git remote add upstream https://gitlab../project.git
+git stash
+git checkout master
+git fetch upstream
+git merge upstream/master
+git stash pop
+</code>
+====== Merge changes form master branch in current branch ======
+<code>
+git.exe merge remotes/origin/master
+</code>