Git thinking

Git - Step by step

Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

We would like to make snapshotsof the university thesis.

Thesis

images/

univ_logo.png

main_page.tex

introduction.tex

Create backup

images

univ_logo.png

main_page.tex

introduction.tex

backup

2011-09-11

2011-10-01_images_ready

2011-11-22_release

Later...

images

univ_logo.png

main_page.tex

introduction.tex

images

univ_logo.png

cover_image.png

main_page.tex

introduction.tex

first_chapter.tex

2011-10-01_images_ready 2011-09-11

++size

backup/

2011-09-11 [300 bytes]

2011-10-01_images_ready [228 kbytes]

2011-11-22_release [500 kbytes]

Sum: 728 kbytes

Changes by the time...

images

univ_logo.png

main_page.tex

introduction.tex

images

univ_logo.png

cover_image.png

main_page.tex

introduction.tex

first_chapter.tex

2011-10-01_images_ready 2011-09-11

Optimizing

images

univ_logo.png

main_page.tex

introduction.tex

2011-10-01_kepek_kesz 2011-09-11

images

univ_logo.png

cover_image.png

main_page.tex

introduction.tex

first_chapter.tex

Transparency

images

univ_logo.png

main_page.tex

introduction.tex

images

cover_image.png

main_page.tex

first_chapter.tex

2011-10-01_kepek_kesz

Transparency

images

univ_logo.png

main_page.tex

introduction.tex

images

cover_image.png

main_page.tex

first_chapter.tex

2011-10-01_kepek_kesz

images

univ_logo.png

main_page.tex

introduction.tex

2011-10-01_images_ready 2011-09-11

images

univ_logo.png

cover_image.png

main_page.txt

introduction.tex

first_chapter.tex

Commit

images

univ_logo.png

main_page.tex

introduction.tex

2011-10-01_images... 2011-09-11

images

univ_logo.png

cover_image.png

main_page.tex

introduction.tex

first_chapter.tex

TitleDateStage

Commits

Structure

Stage { ... // changed files }

Commit { Date date; String title; Stage * stage; Commit * parent; }

Commit * head;

Operations Stage { ... // changed files }

Commit * head;head = 0; // beginning

git_commit(Stage * stage, String title){ Commit * commit = new Commit;

commit->date = date(); commit->title = title; commit->stage = stage; commit.parent = head;

head = commit;}

Operations Stage { ... // changed files }

Commit * head;head = 0; // beginning

git_commit(Stage * stage, String title){ Commit * commit = new Commit;

commit->date = date(); commit->title = title; commit->stage = stage; commit.parent = head;

head = commit;}

Process

stage = new Stage;stage->add("/README.txt");

git_commit(stage, "init repo");

stage = new Stage;stage->add("/README.txt");stage->add("/main.cpp");

git_commit(stage, "Added main.cpp");

git init // head = 0

git add README.txt

git commit -m “init repo”

git add “README.txt”

git add “main.cpp”

git commit -m “Added main.cpp”

Directed Tree

Directed Graph<

Directed tree

Commits

Checkout

// means change the head

git_checkout(Commit * commit){ head = commit;}

git_checkout(0x45F34FE2)

???????

Branches

Commit * master;Commit * branch1;

git_checkout(branch1) <=> head = branch1

branch1

master

Commit * const tag1;Commit * const tag2;

git_checkout(tag1) <=> head = tag1

tag1 tag1

Synchronizingbranch1

master

Pickbranch1

master

branch1

git cherry-pick [commit_id]

Pickbranch1

master

branch1

git cherry-pick [commit_id]

Rebase

building new base

rebase master to branch1

branch1

master

branch1

master

git rebase branch1

branch1

master

git rebase branch1

!= branch1

master

git rebase branch1

branch1

git rebase branch1

branch1

git rebase branch1

branch1

git rebase branch1

branch1

git rebase branch1

branch1

master

git rebase branch1

branch1

master

git merge branch1

branch1

master

git merge branch1

Backup?

PenDrive

D:\NFS

Backup?

PenDrive

D:\NFS

Amazon Storage

Sharing?

Directed Tree

Directed Graph<

branch1

master

Directed Graph

branch1

master

Directed Graph

SSHHTTP

Github

Directed Graph

SSHHTTP

Github

Git remote

SSHhttp

github

Git remote

github

www.github.com

github

git clone git@github.com:Nucc/check.it.git

githubbm

git clone git@github.com:Nucc/check.it.git

github

originbm

More remotes

github

git remote -a http://nucc.balabit.hu/diploma weblap

origin

webpage

Operations

github

Operations

github

git pull origin/master

Operations

github

git pull origin/master

git push origin master

Here and there...

backup

restore

github

Here and there...

backup

restore

github

git reset --hard origin/master

Here and there...

backup

restore

github

git reset --hard origin/master

git push -f origin master

?twitter.com/nucc

Git thinking

Education

2013 GIT Sinhala @ apepanthiya GIT Sinhala... · 2013 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

git-flow - jesusamieiro.com · $ git flow release help $ git flow release list $ git flow release start 0.1.0 $ git branch -a -v $ echo "0.1.0" >> version.txt $ git add version.txt

Git tutorial git branches 20131206-Bryan

Git in pills : git stash

Git LFS - acailly.github.io · $ git config --list [...] filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true

Git Started With Git

2013 GIT Marking Scheme English @ apepanthiya GIT Marking... · Title: 2013 GIT Marking Scheme English @ apepanthiya.lk Subject: G.C.E A/L GIT Marking Schemes Keywords: git marking

YYj t Y GIT) GIT)...(k)GIT) (jJlJY) HP-K IN) Sam le Book GIT) * \YYj t Y GIT) GIT) Created Date 11/12/2018 3:39:52 PM

Lab 1: Git - Hanyang · 2020. 3. 26. · 1. git init 2. git remote add [repoName] [url] 3. git pull [repoName] [branch(e.g. master)] 4. Working… 5. git add * 6. git commit –m

Git & e git beginner workshop

Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Migrating to Git: Let's Git this party started · Git: •git fast-import CVS content into temporary Git repository •Git-move-refs •git prune, repack, gc and repack •Validate

Thinking in Git

Git j club magnets in GIT

Manual Git y Git Hub

Git J Club Dm Git

Fedora Classroom · 2018. 8. 13. · Git repository: Fedora Council Docs Git repository: Quick Docs Git repository: Mentored Projects Git repository: Fedora Modularity Git repository:

PowerPoint Presentation€¦ · $ git init $ git add $ git status $ git commit $ git push $ git pull $ git clone • • • • • • • • $ sudo apt-get install

Smacking Git Around - Advanced Git Tricks

Smacking Git Around Advanced Git Tricks