Курс java-2016. Занятие 04 (часть 2). git и github

Курс по Java, 2016

Git и GitHubЗанятие 04 (часть 2)


GitD — Distributed

V — Version

C -— Control

S — System


Установка GitDebian/Ubuntu:

% sudo apt-get install git

Windows:

https://git-scm.com/download/win




Git init % cd array-reverser

% git initInitialized empty Git repository in /home/gelin/work/github/array-reverser/.git/


Git status % git statusOn branch master

Initial commit

Untracked files: (use "git add <file>..." to include in what will be committed)

.idea/pom.xmlsrc/target/

nothing added to commit but untracked files present (use "git add" to track)


.gitignore

.idea/target/


Git status % git statusOn branch master

Initial commit

Untracked files: (use "git add <file>..." to include in what will be committed)

.gitignorepom.xmlsrc/

nothing added to commit but untracked files present (use "git add" to track)


Git add % git addNothing specified, nothing added.Maybe you wanted to say 'git add .'? % git add . % git add --all % git statusOn branch master

Initial commit

Changes to be committed: (use "git rm --cached <file>..." to unstage)

new file: .gitignorenew file: pom.xmlnew file: src/main/java/ArrayReverser.javanew file: src/test/java/ArrayReverserTest.java


Git config

% git config --global user.name "John Doe"% git config --global user.email [email protected]


Git commit % git commit -m "Added project to git"[master (root-commit) 1357c1a] Added project to git 4 files changed, 89 insertions(+) create mode 100644 .gitignore create mode 100644 pom.xml create mode 100644 src/main/java/ArrayReverser.java create mode 100644 src/test/java/ArrayReverserTest.java


Git log % git logcommit 1357c1a526f62dd008e70a5dcc8f19daf280a574Author: Denis Nelubin <[email protected]>Date: Fri Apr 1 19:05:30 2016 +0600

Added project to git


Git в IDEA (Alt+9)


GitHub1. Зарегистрироваться2. Создать репозиторий3. Пушнуть код


GitHub


Git remote % git remote add origin [email protected]:gelin/array-reverser.git

% git remote -vorigin [email protected]:gelin/array-reverser.git (fetch)origin [email protected]:gelin/array-reverser.git (push)


SSHSecure SHell — выполнение удалённых команд и доступ к удалённому Git

% ssh-keygenGenerating public/private rsa key pair.Enter file in which to save the key (/home/gelin/.ssh/id_rsa):

% cat ~/.ssh/id_rsa.pubssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcwgyvek9Oh5wUNbNUTiEtz1jeRn6WnF1mw3duhPC7B3N9HAvCVtYesu5xLy6wylcKYUdKPLo8Q6hEh8kTcHwL21xPQB4/Uq/PjLUvt+MS5mUfYKwWL/M9h37nztA/scK6ItYWMxP6hsX1/zhOkcw1VsLD0+tHRYVqmAm+qO2VQxJ4Gc0dJWeHIGPq1gLLLlJx1QJHUMbHFewtH8z18ood3w/Q07QIKy2kMxFTK/y6Kv1Ij0rxO1KnnzulJHOiNIffeec7nvjcwe0nLYW7y28sT9cxCBIxNu2Dzir8pqgM1TB+mAw/nsYft9CGYBWc+AaodERHXPIbm2wwUUFWnEAN gelin@zenbook


SSH ключ в GitHub


Git push % git pushfatal: The current branch master has no upstream branch.To push the current branch and set the remote as upstream, use

git push --set-upstream origin master

% git push --set-upstream origin masterCounting objects: 11, done.Delta compression using up to 4 threads.Compressing objects: 100% (7/7), done.Writing objects: 100% (11/11), 1.47 KiB | 0 bytes/s, done.Total 11 (delta 0), reused 0 (delta 0)To [email protected]:gelin/array-reverser.git * [new branch] master -> masterBranch master set up to track remote branch master from origin.


Запушили


В IDEAAlt+9 — status, diff, log

Ctrl+D — diff

Ctrl+K — commit

Shift+Ctrl+K — push


Последовательность1. Пишем код2. Проверяем изменения (и гоняем тесты)

git statusgit diff

3. Фиксируем измененияgit addgit commit

4. Публикуем измененияgit push


Домашнее задание1. Создать репозиторий на GitHub.

2. Запушить проект.

3. Прислать ссылку на проект.

4. Весь код в этом и дальнейших занятиях публиковать на GitHub.

https://git-scm.com/book/ru/v1



Курс java-2016. Занятие 04 (часть 2). git и github

Education