Git Square

Git^2Gentle Introduction To Git

1viernes 21 de octubre de 11

It’s a Me!

• Sergio Arbeo

• Mathematician

• Programmer


History

• Based on BitKeeper (not OSS)

• Collections of scripts


Install Git

• Linux: from source or package.

• Mac: from package or brew.

• Windows: use an installer.


Setting it up

• system

• global

• specific


Setting it up

• git config --global user.name “River Song”

• git config --global user.email [email protected]


mailto:[email protected]

mailto:[email protected]

New repo


New Repo


Next step. New file.


Git status


Track file.


Echo, echo, echo...


WHAT


WHATTHE


WHATTHE

FUCK?


What’s out there?

• Working copy

• Stage

• Commited


Working copy

• Changes

• Not saved


Stage

• Saved changes

• Not committed

• Not in history yet


Stage: git add

• No file.

• But content.


Stage: git add


Committed

• Changes saved

• Committed

• In (local) history


git commit

• Saves the stage area

• Adds a message


git commit


Commit


Rewriting history

• Some nice commit message

• A nice commit message


git commit --amend

• You can

• You should not

• Seriously, forget it


git commit --amend


git log


git log

• -n

• --since=”two days ago”

• --pretty=<format>


Hey, dawg!


What about that distributed thing?


Until now

• Local

• Local

• Local


!local


local

Remote


git remote


git remote

git fetch remotelocal


git remote

git pull remoteworkingcopy


git remote

git push remotelocal


git remote

git clone remote


More, much more

• bisect

• revert

• cherry-pick

• stash (sorry, Fer)

• branches


Git Square

Technology

Transcript of Git Square