Différences

Ci-dessous, les différences entre deux révisions de la page.

--- tech:pb_git [2026/07/01 17:36] – créée Jean-Baptiste
+++ tech:pb_git [2026/07/01 17:38] (Version actuelle) – Jean-Baptiste
@@ Ligne 4: / Ligne 4: @@
 # Pb git
-### pb git reset --hard ne fonctionne pas
+## pb git reset --hard ne fonctionne pas
-#### Solution
+### Solution
 Utiliser `git checkout HEAD`
@@ Ligne 18: / Ligne 18: @@
-### Err: unknown revision or path not in the working tree.
+## Err: unknown revision or path not in the working tree.
 ~~~
@@ Ligne 28: / Ligne 28: @@
-#### Solution
+### Solution
 ~~~bash
@@ Ligne 35: / Ligne 35: @@
-### Pb git diff et git difftool ne fonctionne pas
+## Pb git diff et git difftool ne fonctionne pas
-#### Solution
+### Solution
 Utiliser l'option `--cached`
@@ Ligne 50: / Ligne 50: @@
 ~~~
-FIXME
+## Err: The upstream branch of your current branch does not match the name of your current branch.
+~~~
+$ git push
+fatal: The upstream branch of your current branch does not match
+the name of your current branch.  To push to the upstream branch
+on the remote, use
+    git push origin HEAD:l12-prod
+To push to the branch of the same name on the remote, use
+    git push origin HEAD
+To choose either option permanently, see push.default in 'git help config'.
+To avoid automatically configuring an upstream branch when its name
+won't match the local branch, see option 'simple' of branch.autoSetupMerge
+in 'git help config
+~~~
+### Solution
+~~~bash
+git branch --unset-upstream
+~~~