Advanced Git

What I expect Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

What I expect I You already used Git Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

What I expect I You already used Git I You know how to commit Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

What I expect I You already used Git I You know how to commit I You know how to branch Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

What I expect I You already used Git I You know how to commit I You know how to branch I You know remotes Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Motivation Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Motivation I OSS Projects migrate: Zend Framework, phpBB, PHPUnit, ... Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Motivation I OSS Projects migrate: Zend Framework, phpBB, PHPUnit, ... I Bigger projects have more complex workﬂows Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Motivation I OSS Projects migrate: Zend Framework, phpBB, PHPUnit, ... I Bigger projects have more complex workﬂows I Git is at the beginning of the tech lifecycle Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Beispiel developer Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

A typical work ﬂow Edit Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

A typical work ﬂow Edit Commit Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

A typical work ﬂow Edit Commit Publish Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Feature Branch „Every feature on a branch“ Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

master Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

feature-x master Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

feature-x master DAG (Directed Acyclic Graph) Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

master feature-y git checkout feature-y git rebase master Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Branch and Rebase Commit Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Branch and Rebase Commit Rebase Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Branch and Rebase Commit Rebase Merge Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Interactive Rebasing git rebase -i bf0225ae pick / rotate squash Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Interactive Rebasing feature-y git rebase -i bf0225ae pick / rotate squash Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Interactive Rebasing bf0255ae feature-y git rebase -i bf0225ae pick / rotate squash Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

„Never rebase branches that you pulled or pushed. Rebase local branches only!“ Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Index Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

$ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README.md # no changes added to commit (use "git add" and/or "git commit -a") $ git commit no changes added to commit (use "git add" and/or "git commit -a") Advanced Git I Mayflower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

working directory index repository Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

working directory index repository git add [ﬁle] Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

working directory index repository git add [file] git stage [file] Advanced Git I Mayflower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

working directory index repository git add [file] git stage [file] git commit Advanced Git I Mayflower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

working directory index repository git add [file] git stage [file] git commit git commit -a Advanced Git I Mayflower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

static int run_builtin(struct cmd_st + int status, help; struct stat st; const char *prefix; prefix = NULL; help = argc == 2 && !strcmp(argv[1], if (!help) { if (p->option & RUN_SETUP) prefix = setup_git_directory(); + if (use_pager == -1 && p->option + use_pager = check_pager_c + if (use_pager == -1 && p->option + } use_pager = 1; Commit commit_pager_choice(); git add -p Advanced Git I Mayflower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

New concepts New possibilities Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Project Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

externe Module submodules Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

phpBB git init phpBB git submodule add git://..../zf2.git Zend Framework 2 Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

phpBB git.zendframework.com Zend Framework 2 git init phpBB git submodule add git://..../zf2.git Zend Framework 2 Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

phpBB Zend Framework 2 git.zendframework.com Symfony 2 git.github.com git clone git submodule init git submodule update Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

mr obvious says: Git is not subversion Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

system integration Administration Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Windows Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

CRLF Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

CRLF I There is no svn:eol-style Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

CRLF I There is no svn:eol-style I Modiﬁcations but no commit possible? Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

CRLF I There is no svn:eol-style I Modifications but no commit possible? I git config core.autocrlf true Advanced Git I Mayflower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

CRLF I There is no svn:eol-style I Modifications but no commit possible? I git config core.autocrlf true I git help config Advanced Git I Mayflower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

FileMode Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

FileMode I Windows Share or FAT ﬁlesystem change your exec bit? Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

FileMode I Windows Share or FAT filesystem change your exec bit? I git config core.fileMode false to the rescue Advanced Git I Mayflower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Server Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Server I No git daemon Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Server I No git daemon I No symlinks (FAT ﬁlesystem) Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Server I No git daemon I No symlinks (FAT filesystem) I git config core.symlinks true Advanced Git I Mayflower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Reﬂog Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Reﬂog I Your No 1. tool for recovery Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Reﬂog I Your No 1. tool for recovery I learn it, it‘s IMPORTANT! Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

HEAD@{1} git checkout test git checkout master git branch -D test Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Git can be tricky... ...but it‘s simple once you understood it. Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Summary Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Summary I DAG and Rebase Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Summary I DAG and Rebase I Index Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Summary I DAG and Rebase I Index I Submodule Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

Summary I DAG and Rebase I Index I Submodule I Reﬂog Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

More.... Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

More.... I Concepts Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

More.... I Concepts I Storage format Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

More.... I Concepts I Storage format I Refspecs Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

More.... I Concepts I Storage format I Refspecs I Remotes Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

More.... I Concepts I Storage format I Refspecs I Remotes I Cool features Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

More.... I Concepts I Storage format I Refspecs I Remotes I Cool features I Bisect Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

More.... I Concepts I Storage format I Refspecs I Remotes I Cool features I Bisect I Notes Advanced Git I Mayﬂower GmbH I Jun 1 2010 I 1, Montag, 14. Juni 2010

http://blog.experimentalworks.net	1501
http://www.planet-php.net	110
http://www.slideshare.net	32
http://www.phpeye.com	14
http://planet-php.org	12
http://static.slidesharecdn.com	11
http://planet.entropia.de	10
http://www.planet-php.org	6
http://translate.googleusercontent.com	3
http://webcache.googleusercontent.com	2
http://planet-php.net	1
http://www.pgpf.org	1
http://localhost	1
http://echo.arablance.com	1
http://fasoulas.posterous.com	1
http://www.hanrss.com	1
http://xss.yandex.net	1

Advanced Git

by segv on Jun 15, 2010

Accessibility

Categories

Tags

Upload Details

Usage Rights

17 Embeds 1,708

Statistics

Advanced Git — Presentation Transcript