Differences

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

--- git:git-branches [2023/10/27 15:59] – [Main commands] admin
+++ git:git-branches [2023/10/31 11:51] (current) – [Working with multiple branches] admin
@@ Line 31: / Line 31: @@
 **Important note** : if you checkout from one branch to another, you will lose all the not committed changes in the branch you leave.
-===== Remote pull/push from/to specific branch =====
+===== Pull/push from/to specific remote branch =====
 Tu pull a branch on remote that does not exist locally, we first create an empty local branch, then we pull by setting the right origin. For example for a remote branch **new_branch** :
@@ Line 39: / Line 39: @@
 </code>
+Tu push a local branch to remote, we use **--set-upstream** :
+<code bash>
+git push --set-upstream origin new_branch
+</code>
 ===== Working with multiple branches =====
@@ Line 53: / Line 57: @@
 To get all the differences between branch **b1** and **b2**, do :
 <code bash>
-$ git diff master..foxy
+$ git diff b1..b2
 </code>
 To only see the files that have change , out can type :
 <code bash>
-$ git diff master..foxy | grep "diff --git"
+$ git diff b1..b2 | grep "diff --git"
 </code>
 To see the changes on a single file **file1.txt** :
 <code bash>
-git diff master..foxy file1.txt
+git diff b1..b2 file1.txt
 </code>