From a73d5746c412e644d87083ecbaa7ad7466175d48 Mon Sep 17 00:00:00 2001 From: Lorenzo Bragaglia Date: Tue, 15 Mar 2016 14:04:43 +0100 Subject: [PATCH 1/2] Fix html reserved lt and gt --- pages-content/dictionary.html | 8 ++++---- pages/dictionary.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pages-content/dictionary.html b/pages-content/dictionary.html index 25076606e0..83f06c62d1 100644 --- a/pages-content/dictionary.html +++ b/pages-content/dictionary.html @@ -69,7 +69,7 @@

Git Remotes

  • Add remote connections
    • git remote add <REMOTENAME> <URL>
  • Set a URL to a remote
    • - git remote set-url <REMOTENAME> + git remote set-url <REMOTENAME> <URL>
  • View remote connections
    • git remote -v @@ -79,9 +79,9 @@

    Pulling in Git

    @@ -91,7 +91,7 @@

    Push & Merge in Git

    • Push changes
      • - git push <REMOTENAME> + git push <REMOTENAME> <BRANCHNAME>
    • Merge a branch into current branch
      • git merge <BRANCHNAME>
    diff --git a/pages/dictionary.html b/pages/dictionary.html index 7f15f56b66..44c151acb8 100644 --- a/pages/dictionary.html +++ b/pages/dictionary.html @@ -108,7 +108,7 @@

    Git Remotes

  • Add remote connections
    • git remote add <REMOTENAME> <URL>
  • Set a URL to a remote
    • - git remote set-url <REMOTENAME> + git remote set-url <REMOTENAME> <URL>
  • View remote connections
    • git remote -v @@ -118,9 +118,9 @@

    Pulling in Git

    • Pull in changes
      • - git pull <REMOTENAME> <BRANCHNAME> + git pull
    • Pull in changes from a remote branch
      • - git pull + git pull <REMOTENAME> <REMOTEBRANCH>
    • See changes to the remote before you pull in
      • git fetch --dry-run
    @@ -130,7 +130,7 @@

    Push & Merge in Git

    • Push changes
      • - git push <REMOTENAME> + git push <REMOTENAME> <BRANCHNAME>
    • Merge a branch into current branch
      • git merge <BRANCHNAME>
    From ee60caec50fb1372c12a5b082738a9d86de46b33 Mon Sep 17 00:00:00 2001 From: Lorenzo Bragaglia Date: Tue, 15 Mar 2016 14:11:50 +0100 Subject: [PATCH 2/2] Use same rename option as in tips --- challenge-content-ja/7_branches_arent_just_for_birds.html | 2 +- challenge-content-zhtw/7_branches_arent_just_for_birds.html | 2 +- challenge-content/7_branches_arent_just_for_birds.html | 2 +- challenges/branches_arent_just_for_birds.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/challenge-content-ja/7_branches_arent_just_for_birds.html b/challenge-content-ja/7_branches_arent_just_for_birds.html index 698717b7eb..27299027ce 100644 --- a/challenge-content-ja/7_branches_arent_just_for_birds.html +++ b/challenge-content-ja/7_branches_arent_just_for_birds.html @@ -67,7 +67,7 @@

    ファイルがcontributorsの中にない

    Branch name expected: _____

    ブランチ名はあなたのユーザー名と完全に一致していないといけません。ブランチ名を変更するには:

    -

    $ git branch -M <NEWBRANCHNAME>

    +

    $ git branch -m <NEWBRANCHNAME>

    うまくできたら、もう一回 verify してみましょう!

    diff --git a/challenge-content-zhtw/7_branches_arent_just_for_birds.html b/challenge-content-zhtw/7_branches_arent_just_for_birds.html index ce5e91ea1e..2e227f1ef5 100644 --- a/challenge-content-zhtw/7_branches_arent_just_for_birds.html +++ b/challenge-content-zhtw/7_branches_arent_just_for_birds.html @@ -66,7 +66,7 @@

    File NOT in contributors folder

    Branch name expected: _____

    Branch 的名字應該要跟你的帳號名稱一模一樣。用以下的指令修改 branch 的名字：

    -

    git branch -M <NEWBRANCHNAME>

    +

    git branch -m <NEWBRANCHNAME>

    完成以上的動作之後，再執行一次 git-it verify！

    diff --git a/challenge-content/7_branches_arent_just_for_birds.html b/challenge-content/7_branches_arent_just_for_birds.html index 7b371ab03b..8b192b0b53 100644 --- a/challenge-content/7_branches_arent_just_for_birds.html +++ b/challenge-content/7_branches_arent_just_for_birds.html @@ -72,7 +72,7 @@

    File NOT in contributors folder

    Branch name expected: _____

    The branch name should match your user name exactly. To change your branch name:

    -

    git branch -M <NEWBRANCHNAME>

    +

    git branch -m <NEWBRANCHNAME>

    When you've made your updates, verify again!

    diff --git a/challenges/branches_arent_just_for_birds.html b/challenges/branches_arent_just_for_birds.html index 0237534c4f..3f718e6705 100644 --- a/challenges/branches_arent_just_for_birds.html +++ b/challenges/branches_arent_just_for_birds.html @@ -198,7 +198,7 @@

    File NOT in contributors folder

    Branch name expected: _____

    The branch name should match your user name exactly. To change your branch name:

    -

    git branch -M <NEWBRANCHNAME>

    +

    git branch -m <NEWBRANCHNAME>

    When you've made your updates, verify again!