Разделы презентаций


GIT Basics Kostiantyn Vorflik Junior Software Engineer OCTOBER 21, 2016

GIT BASICS IIPart I

Слайды и текст этой презентации

Слайд 1GIT Basics


Kostiantyn Vorflik
Junior Software Engineer
OCTOBER 21, 2016

GIT BasicsKostiantyn VorflikJunior Software EngineerOCTOBER 21, 2016

Слайд 2GIT BASICS II
Part I

GIT BASICS IIPart I

Слайд 3Agenda

Agenda

Слайд 4Rebasing
git checkout master
git merge experiment
git checkout experiment
git rebase master
Do not

rebase commits that were pushed to public repository!

Rebasinggit checkout mastergit merge experimentgit checkout experimentgit rebase masterDo not rebase commits that were pushed to public

Слайд 5Interactive rebasing
Allows you to do interactive rebasing.
git rebase [branch] -i
pick

652e6db add description
pick d399dbb fix bug

# Rebase 8ab9919..d399dbb onto 8ab9919

(2 command(s))
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
# Note that empty commits are commented out

$ git rebase -i master
Stopped at 652e6db2d64853dafa66bbb40f98e8f826a5a798... add description
You can amend the commit now, with

git commit --amend

Once you are satisfied with your changes, run

git rebase --continue

Interactive rebasingAllows you to do interactive rebasing.git rebase [branch] -ipick 652e6db add descriptionpick d399dbb fix bug# Rebase

Слайд 6Stashing
git stash
The command saves your local modifications away and reverts

the working
directory to match the HEAD commit.
git stash list
List the stashes

that you currently have. 

git stash pop

List the stashes that you currently have. 

git stash save [message]

the same as

git stash clear

Remove all the stashed states.

Stashinggit stashThe command saves your local modifications away and reverts the working directory to match the HEAD commit.git stash

Слайд 7The reset magic: 3 steps
Initial state

The reset magic: 3 stepsInitial state

Слайд 8TortoiseGit

TortoiseGit

Слайд 9Perforce - Visual Merge and Diff Tools

Perforce - Visual Merge and Diff Tools

Слайд 10Resources

Resources

Слайд 11Q&A

Do you have any questions?

Q&ADo you have any questions?

Слайд 12Thank you!

Thank you!

Обратная связь

Если не удалось найти и скачать доклад-презентацию, Вы можете заказать его на нашем сайте. Мы постараемся найти нужный Вам материал и отправим по электронной почте. Не стесняйтесь обращаться к нам, если у вас возникли вопросы или пожелания:

Email: Нажмите что бы посмотреть 

Что такое TheSlide.ru?

Это сайт презентации, докладов, проектов в PowerPoint. Здесь удобно  хранить и делиться своими презентациями с другими пользователями.


Для правообладателей

Яндекс.Метрика