Merge pull request jlord#145 from Sequoia/master

Change delete branch guide to not use "force"
dominhhai · Jan 29, 2015 · 6a5d964 · 6a5d964
2 parents 70bdfbc + 6f37b86
commit 6a5d964
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/guide/raw-content-zhtw/11_merge_tada.html b/guide/raw-content-zhtw/11_merge_tada.html
@@ -16,7 +16,7 @@ <h2>步驟：從本機 <v>Merge</v></h2>
       <p><code>$ git merge &#60;BRANCHNAME&#62;</code></p>
 
       <p>整理一下吧，現在把剛剛已經 <v>merged</v> 的 <n>feature</n> <n>branch</n> 刪掉。</p>
-      <p><code>$ git branch -D &#60;BRANCHNAME&#62;</code></p>
+      <p><code>$ git branch -d &#60;BRANCHNAME&#62;</code></p>
 
       <p>也可以把 <n>branch</n> 從 GitHub 上的 <adj>forked</adj> <n>repository</n> 中刪除哦：</p>
       <p><code>$ git push &#60;REMOTENAME&#62; --delete &#60;BRANCHNAME&#62;</code></p>
@@ -45,7 +45,7 @@ <h2>撇步</h2>
           <li><strong>切換正在工作的 <n>branch</n></strong></li>
           <code>$ git checkout &#60;BRANCHNAME&#62;</code>
           <li><strong>刪除本機的 <n>branch</n></strong></li>
-          <code>$ git branch -D &#60;BRANCHNAME&#62;</code>
+          <code>$ git branch -d &#60;BRANCHNAME&#62;</code>
           <li><strong>刪除 <n>remote</n> <n>branch</n></strong></li>
           <code>$ git push &#60;REMOTENAME&#62; --delete &#60;BRANCHNAME&#62;</code>
           <li><strong>從 <n>remote</n> <n>branch</n> <v>Pull</v></strong></li>

diff --git a/guide/raw-content/11_merge_tada.html b/guide/raw-content/11_merge_tada.html
@@ -21,7 +21,7 @@ <h2>Step: Merge Locally</h2>
       <p><code>$ git merge &#60;BRANCHNAME&#62;</code></p>
 
       <p>Tidy up by deleting your feature branch now that it has been merged.</p>
-      <p><code>$ git branch -D &#60;BRANCHNAME&#62;</code></p>
+      <p><code>$ git branch -d &#60;BRANCHNAME&#62;</code></p>
 
       <p>You can also delete the branch from your fork on GitHub:</p>
       <p><code>$ git push &#60;REMOTENAME&#62; --delete &#60;BRANCHNAME&#62;</code></p>
@@ -54,7 +54,7 @@ <h2>Tips</h2>
           <li><strong>Change the branch you're working on</strong></li>
           <code>$ git checkout &#60;BRANCHNAME&#62;</code>
           <li><strong>Delete a local branch</strong></li>
-          <code>$ git branch -D &#60;BRANCHNAME&#62;</code>
+          <code>$ git branch -d &#60;BRANCHNAME&#62;</code>
           <li><strong>Delete a remote branch</strong></li>
           <code>$ git push &#60;REMOTENAME&#62; --delete &#60;BRANCHNAME&#62;</code>
           <li><strong>Pull from a remote branch</strong></li>

diff --git a/help.txt b/help.txt
@@ -75,7 +75,7 @@
 
   {bold}Delete a local branch{/bold}
 
-  $ git branch -D <BRANCHNAME>
+  $ git branch -d <BRANCHNAME>
 
   {bold}Delete a remote branch{/bold}
 
@@ -112,4 +112,4 @@
   {bold}Remove (delete) a folder{/bold}
 
   $ rm -rf <FOLDERNAME>
-
+