Git a Stupid Introduction

8/8/2019 Git a Stupid Introduction

http://slidepdf.com/reader/full/git-a-stupid-introduction 1/108

Git

A stupid Introduction to animbecile version control system

Rafael Magaña => [email protected]

miércoles 20 de octubre de 2010

mailto:[email protected]





Cheap branching, cheap tagging and easy merging

Git is an open source, distributed version control

system designed for speed and efficiency.

What else Git is?




git initmiércoles 20 de octubre de 2010



creates an empty git repository or reinitialize an existWhat does creating a repo exactly mean?

to create a directory named .git with some subdire

to create a file named HEAD that references the hemaster branch




git clone <repository> [<directory>




clones a repository into a newly created directory

creates remote-tracking branches for each branch incloned repo

checks out an initial branch equal to the cloned reposcurrently active branch.




git clone support different protocolsrsync://host.xz/path/to/repo.git/

[:port]/path/to/repo.git/

git://host.xz[:port]/path/to/repo.git/ ssh://[user@]host.xz[:port]/path/to/repo.git/


http://host.xz/

http://host.xz/


http://slidepdf.com/reader/full/git-a-stupid-introduction 10/108miércoles 20 de octubre de 2010



git configmiércoles 20 de octubre de 2010



gets and sets repository or global options

$ git config --global user.name “Rafael Magaña” ( ~/gitconfig)

$ git config --global user.email “[email protected]” (~/gitcon

$ git config user.name “Rafael Magaña” (.git/config)

$ git config user.email “[email protected]” (.git/config)










The git directory

.git directory that stores all history and meta informa




remote

a remote repository




local repository

the result of clone a remote with git clone <repo>




commit

to send your changes to your local repository




master branchthe first and default branch in a repo

(mostly used as dev branch)




origin

the default and first remote (upstream repository




origin/master

the remote branch called master in the remote called origin




working directory

the directory that holds the files you are working o




staging area

it’s where your changes must be placed before commit

it’s a place between your working directory and your local reposito




index

an alias for the staging area




Object

consist of three things:

type

size

content (be aware that git doesn’t care about files but content)




Type

blob, tree, commit and tag




Content

depends on the object




blob

it is used to store file data. it is generally a fi




tree

it is like a directory.

It references a bunch of other trees and/or blo




commit

points to a single object, marking it as what t

project looked like at a certain point in time




tag

a way to mark a specific commit




SHA1

All the information needed to represent the hisa project is stored in files referenced by a 40

"object name" that looks something like t

fdb25ef2c3baf28cb963e26c8949c632ff64b




git show fdb25e

SHA1




You can see that we have createda tree object for each directory(including the root) and a blob

object for each file. Then we havea commit object to point to theroot, so we can track what ourproject looked like when it wascommitted.




COMMIT_EDITMSG

the commit message holder file




COMMIT_EDITMSGif you issue “git commit”, git will open an edit

to edit the message, it will be stored in thisholder and then git will execute:

$git commit -m COMMIT_EDITMSG

once the editor is closed




HEAD

pointer to the current commit




ORIG_HEAD

previous state of HEAD

used to revert dangerous operations




config

your configuration preferences

(name, email, remotes, etc)




hooks/

pre/post action hooks (scripts)




index

it links the history to the current

contents of the working tree




logs/

a history of where your

branches have been




objects/

(commits, trees, blobs, tags)

the history




refs/

directory which stores pointers to local

and remote branches




Edit your files

Stage the changes

git add [-u]

Review your changes

git status

git diff

Commit the changes

git commit




git add/git add -u

git commit

git commit -a (executes git add -u)

git diff (comparision)

git diff --cached

git diff HEAD




editing files




without modified files




with modified files (in working directory)




staging the changes




git add README




git status




git reset HEAD README




git add README




reviewing changes




git diff (not staged changes)




git diff --cached (staged changes)




git diff HEAD (all the changes)




commiting changes




git commit

1e7059emiércoles 20 de octubre de 2010



git log

1e7059emiércoles 20 de octubre de 2010



fixing and editing commits




git show 1e7059e




Edit the README file




git add README




git commit --amend


it ill it/COMMIT MSG



git will open .git/COMMIT_MSG




save it and close the editor

git will commit for you




7572e98miércoles 20 de octubre de 2010



git log

7572e98miércoles 20 de octubre de 2010



git add/git add -u

git commit (amend)

git commit -a (executes git add -u)

git reset --soft

git reset --mixed

git push

git pull (git fetch and git merge or git rebase)

git reset HEAD

reset --hard

git fetch




git init (initializes a git repository)

git clone (brings remote repositories)

git config (configures preferences)

git status (shows the working tree status)

git add (takes changes to the index)

git diff (show changes in diff format)

git commit (takes changes to the local repo)

git log (shows the history)

git show (shows objects)

git reset (reset currenthe specified state)

git fetch (fetches obje

git merge (join two odevelopment historie

git pull = git fetch + g

one stepgit push (takes local the remote repository




git branch bugfixcreates a local branch




git checkout bugfixswitches to bugfix branch




git checkout -b bugfixcreates branch and switches to it




git checkout -b dev -t origin/de

creates a local branch which tracks a remote bra




git branch -d bugfixdeletes bugfix branch




git branch -lshows local branches




git branch -rshows remote branches




git branch




John: git pull

git checkout -b task

git commit -am “C2”


git commit -am “C4”git commit -am “C5”




Peter: git pull

git checkout -b try_out







Sam: git pull

git checkout -b fixing







John, Peter and Sam are They need to “git pull”



Scott: git pullgit checkout master


git push origin master

y g p




git checkout master

Switching to our local master branch




git pull origin master

Updating our local respository





git checkout mas



git merge try_out

git push origin ma

git branch -d try_o





git checkout try_o



git rebase master

git rebase try_out

git push origin ma




git tag v2.0




Rafael Magaña => [email protected]





Git a Stupid Introduction

Documents

Transcript of Git a Stupid Introduction