Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
matrix:
include:
- slide: git
output_name: github-desktop-slide
output_name: git-vscode-slide
- slide: design
output_name: basic-design-slide
- slide: about-webapp
Expand Down
42 changes: 29 additions & 13 deletions git/README.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,45 @@
# Git / Github 学習資料

## 0. 事前準備
### 0-1. Github Desktop をインストールする
### 0-1. Git をインストールする

以下URLから **Github Desktop** をインストールしてください
尚、既にGit/Githubに関する知識があり、使い慣れたツール等がある場合はスキップして構いません
本資料では、**Git** を利用します。以下を参考にインストールしてください
既にインストール済みの場合はスキップして構いません(ターミナルで `git -v` を実行して、バージョンが表示されれば導入済みです)

- [Github Desktop Installation](https://docs.github.com/ja/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/installing-github-desktop)
- macOS: ターミナルで `xcode-select --install` を実行
- Windows: [Git for Windows](https://gitforwindows.org/) をインストール

### 0-2. Visual Studio Code をインストールする

開発に利用するエディタが無い場合は、**Visual Studio Code** をインストールしてください
使い慣れたエディタがある場合は、そちらを利用していただいて問題ありませんが、導入を推奨します
本資料では、**Visual Studio Code**(VSCode)の Git 機能を利用して開発を進めます
以下 URL からインストールしてください

- [Visual Studio Installation](https://code.visualstudio.com/)
- [Visual Studio Code Installation](https://code.visualstudio.com/)

### 0-3. Git の初期設定をする

コミットの記録に使われる名前とメールアドレスを設定します。
未設定のままだとコミットできないため、ターミナルで以下を実行してください。

```sh
git config --global user.name "自分の名前"
git config --global user.email "自分のメールアドレス"
```

### 0-4. Github アカウントを準備する

[Github](https://github.com/) のアカウントを作成しておいてください。
VSCode から Github へのサインインは、本編(2-5. push)の中で行います。

## 1. 目次

1. [導入編 (10min)](./docs.md#1-導入編)
- 1-1. [Gitとは何か?](./docs.md/#1-1-gitとは何か)
- 1-2. [Githubとは何か?](./docs.md/#1-2-githubとは何か)
- 1-3. [Github Desktopとは何か?](./docs.md/#1-3-github-desktopとは何か)
- 1-1. [Gitとは何か?](./docs.md#1-1-gitとは何か)
- 1-2. [Githubとは何か?](./docs.md#1-2-githubとは何か)
- 1-3. [VSCodeのGit機能とは何か?](./docs.md#1-3-vscodeのgit機能とは何か)

2. [Github Desktopを触ってみよう (50min)](./docs.md#2-github-desktopを触ってみよう)
- 2-1. [clone: Githubリポジトリを丸ごとダウンロードしよう](./docs.md/#2-1-clone-githubリポジトリを丸ごとダウンロードしよう)
2. [VSCodeのGit機能を触ってみよう (50min)](./docs.md#2-vscodeのgit機能を触ってみよう)
- 2-1. [clone: Githubリポジトリを丸ごとダウンロードしよう](./docs.md#2-1-clone-githubリポジトリを丸ごとダウンロードしよう)
- 2-2. [branch: 作業を枝分かれさせよう](./docs.md#2-2-branch-作業を枝分かれさせよう)
- 2-3. [commit: 作業前と後の**差分を記録**しよう](./docs.md#2-3-commit-作業前と後の差分を記録しよう)
- 2-4. [log: 作業の履歴を確認しよう](./docs.md#2-4-log-作業の履歴を確認しよう)
Expand All @@ -35,4 +51,4 @@
## 2. URL

- テキスト: [資料](./docs.md)
- スライド: [プレゼンテーション表示](https://jigintern.github.io/intern-dev-tutorial/git/github-desktop-slide.html), [一覧表示](https://jigintern.github.io/intern-dev-tutorial/git/github-desktop-slide.pdf)
- スライド: [プレゼンテーション表示](https://jigintern.github.io/intern-dev-tutorial/git/git-vscode-slide.html), [一覧表示](https://jigintern.github.io/intern-dev-tutorial/git/git-vscode-slide.pdf)
165 changes: 94 additions & 71 deletions git/docs.md

Large diffs are not rendered by default.

Binary file removed git/imgs/materials/03_github_desktop_home.png
Binary file not shown.
Binary file added git/imgs/screen-shots/01_github_code_button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added git/imgs/screen-shots/03_clone_input_url.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added git/imgs/screen-shots/04_clone_select_folder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed git/imgs/screen-shots/04_view_with_vscode.png
Binary file not shown.
Binary file removed git/imgs/screen-shots/05_branch_form.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed git/imgs/screen-shots/06_branch_name.png
Binary file not shown.
Binary file added git/imgs/screen-shots/06_view_cloned_files.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed git/imgs/screen-shots/07_branch_bring_changes.png
Binary file not shown.
Binary file added git/imgs/screen-shots/07_statusbar_branch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed git/imgs/screen-shots/08_create_file.png
Binary file not shown.
Binary file added git/imgs/screen-shots/08_create_new_branch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added git/imgs/screen-shots/09_branch_name_input.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed git/imgs/screen-shots/09_write_python_code.png
Binary file not shown.
Binary file added git/imgs/screen-shots/10_branch_switched.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed git/imgs/screen-shots/10_view_changes.png
Binary file not shown.
Binary file added git/imgs/screen-shots/11_create_file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed git/imgs/screen-shots/11_input_commit_message.png
Binary file not shown.
Binary file removed git/imgs/screen-shots/12_view_history.png
Binary file not shown.
Binary file added git/imgs/screen-shots/12_write_python_code.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed git/imgs/screen-shots/13_github_pull_request.png
Diff not rendered.
Binary file removed git/imgs/screen-shots/13_publish_branch.png
Diff not rendered.
Binary file added git/imgs/screen-shots/13_scm_view_changes.png
Binary file removed git/imgs/screen-shots/14_confirm_publish.png
Diff not rendered.
Binary file added git/imgs/screen-shots/14_scm_stage_changes.png
Binary file added git/imgs/screen-shots/15_scm_commit.png
Binary file added git/imgs/screen-shots/16_source_control_graph.png
Binary file added git/imgs/screen-shots/17_publish_branch.png
Binary file added git/imgs/screen-shots/20_confirm_publish.png
Binary file removed git/imgs/screen-shots/21_checkout_main.png
Diff not rendered.
Binary file removed git/imgs/screen-shots/22_fetch_origin.png
Diff not rendered.
Binary file removed git/imgs/screen-shots/23_pull_origin.png
Diff not rendered.
Binary file removed git/imgs/screen-shots/24_results.png
Diff not rendered.
Binary file added git/imgs/screen-shots/27_checkout_main.png
Binary file added git/imgs/screen-shots/28_fetch_pull_menu.png
Binary file added git/imgs/screen-shots/29_sync_incoming.png
Binary file added git/imgs/screen-shots/30_pull_results.png
Loading