aboutsummaryrefslogtreecommitdiffstats
path: root/docs/ja/_summary.md
diff options
context:
space:
mode:
authorGravatar Takeshi ISHII <2170248+mtei@users.noreply.github.com>2019-12-29 16:38:33 +0900
committerGravatar James Young <18669334+noroadsleft@users.noreply.github.com>2019-12-28 23:38:33 -0800
commit25aaeb4f401fedee00e90e9fe27bdea5fed778d6 (patch)
treec25ff710ab2b2fc4008c48c2a16f00bbcb437109 /docs/ja/_summary.md
parent36d913e1b135a2885678c7ee239572121bebca55 (diff)
downloadqmk_firmware-25aaeb4f401fedee00e90e9fe27bdea5fed778d6.tar.gz
Japanese translation of docs/newbs_git_*.md (#7689)
* update docs/ja/newbs.md * update docs/ja/_summary.md * Translate docs/newbs_git_best_practices.md into Japanese. * Translate docs/newbs_git_using_your_master_branch.md into Japanese. * Translate docs/newbs_git_resolving_merge_conflicts.md into Japanese. * Translate docs/newbs_git_resynchronize_a_branch.md into Japanese. * Update docs/ja/newbs_git_using_your_master_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * update ja/newbs_git_resynchronize_a_branch.md * update ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_best_practices.md * Update docs/ja/_summary.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * update ja/newbs_git_resynchronize_a_branch.md * update ja/newbs_learn_more_resources.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md Co-Authored-By: shela <shelaf@users.noreply.github.com>
Diffstat (limited to 'docs/ja/_summary.md')
-rw-r--r--docs/ja/_summary.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/ja/_summary.md b/docs/ja/_summary.md
index 22db3a7fe..e5e19ddc8 100644
--- a/docs/ja/_summary.md
+++ b/docs/ja/_summary.md
@@ -3,7 +3,10 @@
* [初めてのファームウェアの構築](ja/newbs_building_firmware.md)
* [ファームウェアのフラッシュ](ja/newbs_flashing.md)
* [テストとデバッグ](ja/newbs_testing_debugging.md)
- * [Gitのベストプラクティス](ja/newbs_best_practices.md)
+ * [QMK における Git 運用作法](ja/newbs_git_best_practices.md)
+ * [あなたのフォークの master ブランチ](ja/newbs_git_using_your_master_branch.md)
+ * [マージの競合の解決](ja/newbs_git_resolving_merge_conflicts.md)
+ * [同期のとれていない git ブランチの再同期](ja/newbs_git_resynchronize_a_branch.md)
* [学習リソース](ja/newbs_learn_more_resources.md)
* [QMKの基本](ja/README.md)