diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ja/newbs_git_best_practices.md | 4 | ||||
| -rw-r--r-- | docs/ja/newbs_git_resolving_merge_conflicts.md | 4 | ||||
| -rw-r--r-- | docs/ja/newbs_git_resynchronize_a_branch.md | 4 | ||||
| -rw-r--r-- | docs/ja/newbs_git_using_your_master_branch.md | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/docs/ja/newbs_git_best_practices.md b/docs/ja/newbs_git_best_practices.md index 4e20e4e0b0..7ba16fce75 100644 --- a/docs/ja/newbs_git_best_practices.md +++ b/docs/ja/newbs_git_best_practices.md @@ -2,8 +2,8 @@ <!--- grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh - original document: adf4acf59:docs/newbs_git_best_practices.md - git diff adf4acf59 HEAD -- docs/newbs_git_best_practices.md | cat + original document: 0.9.0:docs/newbs_git_best_practices.md + git diff 0.9.0 HEAD -- docs/newbs_git_best_practices.md | cat --> ## または、"如何にして私は心配することをやめて Git を愛することを学んだか。" diff --git a/docs/ja/newbs_git_resolving_merge_conflicts.md b/docs/ja/newbs_git_resolving_merge_conflicts.md index 893c3d5035..532b1e3001 100644 --- a/docs/ja/newbs_git_resolving_merge_conflicts.md +++ b/docs/ja/newbs_git_resolving_merge_conflicts.md @@ -2,8 +2,8 @@ <!--- grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh - original document: adf4acf59:docs/newbs_git_resolving_merge_conflicts.md - git diff adf4acf59 HEAD -- docs/newbs_git_resolving_merge_conflicts.md | cat + original document: 0.9.0:docs/newbs_git_resolving_merge_conflicts.md + git diff 0.9.0 HEAD -- docs/newbs_git_resolving_merge_conflicts.md | cat --> ブランチでの作業の完了に時間がかかる場合、他の人が行った変更が、プルリクエストを開いたときにブランチに加えた変更と競合することがあります。 diff --git a/docs/ja/newbs_git_resynchronize_a_branch.md b/docs/ja/newbs_git_resynchronize_a_branch.md index e81d2da1fb..567ec38bfe 100644 --- a/docs/ja/newbs_git_resynchronize_a_branch.md +++ b/docs/ja/newbs_git_resynchronize_a_branch.md @@ -2,8 +2,8 @@ <!--- grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh - original document: adf4acf59:docs/newbs_git_resynchronize_a_branch.md - git diff adf4acf59 HEAD -- docs/newbs_git_resynchronize_a_branch.md | cat + original document: 0.9.0:docs/newbs_git_resynchronize_a_branch.md + git diff 0.9.0 HEAD -- docs/newbs_git_resynchronize_a_branch.md | cat --> 仮にあなたの `master` ブランチにあなたのコミットを行い、そしてあなたの QMK リポジトリの更新が必要になったとします。 diff --git a/docs/ja/newbs_git_using_your_master_branch.md b/docs/ja/newbs_git_using_your_master_branch.md index 3ee1996c1b..308a61eded 100644 --- a/docs/ja/newbs_git_using_your_master_branch.md +++ b/docs/ja/newbs_git_using_your_master_branch.md @@ -2,8 +2,8 @@ <!--- grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh - original document: adf4acf59:docs/newbs_git_using_your_master_branch.md - git diff adf4acf59 HEAD -- docs/newbs_git_using_your_master_branch.md | cat + original document: 0.9.0:docs/newbs_git_using_your_master_branch.md + git diff 0.9.0 HEAD -- docs/newbs_git_using_your_master_branch.md | cat --> QMK の開発では、何がどこで行われているかにかかわらず、`master` ブランチを最新の状態に保つことを強くお勧めします、しかし `master` ブランチには***絶対に直接コミットしないでください***。 |