From e23eb747dab33d91383a14e053dbca816b070126 Mon Sep 17 00:00:00 2001 From: apastan Date: Tue, 10 Jan 2023 16:22:33 +0300 Subject: [PATCH] Update info how to reset local branch to remote-tracking branch --- README.md | 4 ++-- README_es.md | 2 +- README_fr.md | 3 +-- README_ja.md | 2 +- README_kr.md | 2 +- README_ru.md | 2 +- README_vi.md | 2 +- README_zh-CN.md | 2 +- README_zh-TW.md | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b42c461..4424825 100644 --- a/README.md +++ b/README.md @@ -903,10 +903,10 @@ Confirm that you haven't pushed your changes to the server. # ``` -One way of resetting to match origin (to have the same as what is on the remote) is to do this: +One way of resetting branch `my-branch` to match `origin/my-branch` (to have the same as what is on the remote) is to do this: ```sh -(main)$ git reset --hard origin/my-branch +(my-branch)$ git reset --hard origin/my-branch ``` diff --git a/README_es.md b/README_es.md index 77ba527..b5b6efd 100644 --- a/README_es.md +++ b/README_es.md @@ -515,7 +515,7 @@ Confirma que no ha enviado sus cambios al servidor. Una forma de reiniciar para hacer coincidir el origin (tener lo mismo que lo que está en el control remoto) es hacer esto: ```sh -(main) $ git reset --hard origin / my-branch +(my-branch) $ git reset --hard origin/my-branch ``` ### Hice commit a main en lugar de una nueva rama diff --git a/README_fr.md b/README_fr.md index 3afc804..75aebcc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -576,7 +576,6 @@ Assurez-vous que vous n'avez pas poussé vos modifications sur le serveur. `git status` devrait vous indiquer combien de commits en avance vous êtes par rapport à origin : ```sh -(my-branch)$ git status (ma-branche)$ git status # On branch ma-branche # Your branch is ahead of 'origin/my-branch' by 2 commits. @@ -587,7 +586,7 @@ Assurez-vous que vous n'avez pas poussé vos modifications sur le serveur. Une des façons de faire pour réinitialiser votre branche afin qu'elle corresponde à origin (afin d'avoir la même chose que le dépôt distant) est de lancer ceci : ```sh -(main)$ git reset --hard origin/ma-branche +(ma-branche)$ git reset --hard origin/ma-branche ``` diff --git a/README_ja.md b/README_ja.md index 0ad1940..afd34e0 100644 --- a/README_ja.md +++ b/README_ja.md @@ -919,7 +919,7 @@ $ git reset --hard c5bc55a origin と同じ状態にリセットする（リモートと同じ状態にする）方法の一つは次の通りです。 ```sh -(main)$ git reset --hard origin/my-branch +(my-branch)$ git reset --hard origin/my-branch ``` diff --git a/README_kr.md b/README_kr.md index 14bd841..6c2b511 100644 --- a/README_kr.md +++ b/README_kr.md @@ -547,7 +547,7 @@ $ git reset --hard c5bc55a 오리진(리모트과 같은 상태의)로 맞추는 리셋을 하는 방법 중 하나는: ```sh -(main)$ git reset --hard origin/my-branch +(my-branch)$ git reset --hard origin/my-branch ``` diff --git a/README_ru.md b/README_ru.md index 48376ee..70c86ca 100644 --- a/README_ru.md +++ b/README_ru.md @@ -808,7 +808,7 @@ $ git reset --hard c5bc55a Один из способов сбросить до источника (чтобы иметь то же, что и в удаленном репозитории): ```sh -(main)$ git reset --hard origin/my-branch +(my-branch)$ git reset --hard origin/my-branch ``` diff --git a/README_vi.md b/README_vi.md index f08e73c..dcef75a 100644 --- a/README_vi.md +++ b/README_vi.md @@ -853,7 +853,7 @@ Kiểm tra rằng bạn chưa push các thay đổi của mình đến server. Một cách để reset về origin (để có nhánh giống như trên remote) là chạy lệnh: ```sh -(main)$ git reset --hard origin/my-branch +(my-branch)$ git reset --hard origin/my-branch ``` diff --git a/README_zh-CN.md b/README_zh-CN.md index 9c53364..df693cb 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -376,7 +376,7 @@ $ git reset --hard c5bc55a 一种方法是: ```sh -(main)$ git reset --hard origin/my-branch +(my-branch)$ git reset --hard origin/my-branch ``` diff --git a/README_zh-TW.md b/README_zh-TW.md index 34f22f0..680d70d 100644 --- a/README_zh-TW.md +++ b/README_zh-TW.md @@ -376,7 +376,7 @@ $ git reset --hard c5bc55a 一種方法是: ```sh -(main)$ git reset --hard origin/my-branch +(my-branch)$ git reset --hard origin/my-branch ```