Skip to content
This repository
Browse code

Merge pull request #374 from southly/fix-typo

fix typo
  • Loading branch information...
commit 5b9a1a9bab159cd9d69d9b5a239cd0f1130ccf2e 2 parents daf1c2f + d82f333
Jean-Noël Avila authored March 01, 2013
2  ar/03-git-branching/01-chapter3.markdown
Source Rendered
@@ -315,7 +315,7 @@ Notice the `*` character that prefixes the `master` branch: it indicates the bra
315 315
 	* master  7a98805 Merge branch 'iss53'
316 316
 	  testing 782fd34 add scott to the author list in the readmes
317 317
 
318  
-Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch merged`:
  318
+Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch --merged`:
319 319
 
320 320
 	$ git branch --merged
321 321
 	  iss53
2  es-ni/03-git-branching/01-chapter3.markdown
Source Rendered
@@ -315,7 +315,7 @@ Notice the `*` character that prefixes the `master` branch: it indicates the bra
315 315
 	* master  7a98805 Merge branch 'iss53'
316 316
 	  testing 782fd34 add scott to the author list in the readmes
317 317
 
318  
-Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch merged`:
  318
+Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch --merged`:
319 319
 
320 320
 	$ git branch --merged
321 321
 	  iss53
2  ja/03-git-branching/01-chapter3.markdown
Source Rendered
@@ -314,7 +314,7 @@ Git は新たなマージコミットを自動的には作成しませんでし
314 314
 	* master  7a98805 Merge branch 'iss53'
315 315
 	  testing 782fd34 add scott to the author list in the readmes
316 316
 
317  
-各ブランチの状態を知るために便利なもうひとつの機能として、現在作業中のブランチにマージ済みかそうでないかによる絞り込みができるようになっています。そのための便利なオプション `--merged` と `--no-merged` が、Git バージョン 1.5.6 以降で使用可能となりました。現在作業中のブランチにマージ済みのブランチを調べるには `git branch merged` を実行します。
  317
+各ブランチの状態を知るために便利なもうひとつの機能として、現在作業中のブランチにマージ済みかそうでないかによる絞り込みができるようになっています。そのための便利なオプション `--merged` と `--no-merged` が、Git バージョン 1.5.6 以降で使用可能となりました。現在作業中のブランチにマージ済みのブランチを調べるには `git branch --merged` を実行します。
318 318
 
319 319
 	$ git branch --merged
320 320
 	  iss53
2  mk/03-git-branching/01-chapter3.markdown
Source Rendered
@@ -315,7 +315,7 @@ Notice the `*` character that prefixes the `master` branch: it indicates the bra
315 315
 	* master  7a98805 Merge branch 'iss53'
316 316
 	  testing 782fd34 add scott to the author list in the readmes
317 317
 
318  
-Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch merged`:
  318
+Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch --merged`:
319 319
 
320 320
 	$ git branch --merged
321 321
 	  iss53
2  th/03-git-branching/01-chapter3.markdown
Source Rendered
@@ -315,7 +315,7 @@ Notice the `*` character that prefixes the `master` branch: it indicates the bra
315 315
 	* master  7a98805 Merge branch 'iss53'
316 316
 	  testing 782fd34 add scott to the author list in the readmes
317 317
 
318  
-Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch merged`:
  318
+Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch --merged`:
319 319
 
320 320
 	$ git branch --merged
321 321
 	  iss53
2  zh-tw/03-git-branching/01-chapter3.markdown
Source Rendered
@@ -315,7 +315,7 @@ Notice the `*` character that prefixes the `master` branch: it indicates the bra
315 315
 	* master  7a98805 Merge branch 'iss53'
316 316
 	  testing 782fd34 add scott to the author list in the readmes
317 317
 
318  
-Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch merged`:
  318
+Another useful option to figure out what state your branches are in is to filter this list to branches that you have or have not yet merged into the branch you’re currently on. The useful `--merged` and `--no-merged` options have been available in Git since version 1.5.6 for this purpose. To see which branches are already merged into the branch you’re on, you can run `git branch --merged`:
319 319
 
320 320
 	$ git branch --merged
321 321
 	  iss53

0 notes on commit 5b9a1a9

Please sign in to comment.
Something went wrong with that request. Please try again.