Advanced Git

Advanced Git

David Soria Parra I 1 Jun 2010 | @dsp_
1.

© 2010 Mayﬂower GmbH

Montag, 14. Juni 2010

What I expect

Advanced Git I Mayﬂower GmbH I Jun 1 2010 I
1,


What I expect

I You already used Git

1,


What I expect

I You know how to commit

1,


What I expect

I You know how to branch

1,


What I expect

I You know how to branch
I You know remotes

1,


Motivation

1,


Motivation

I OSS Projects migrate: Zend Framework, phpBB, PHPUnit, ...

1,


Motivation

I Bigger projects have more complex workﬂows

1,


Motivation

I Bigger projects have more complex workﬂows
I Git is at the beginning of the tech lifecycle

1,


Beispiel

developer

1,


A typical work ﬂow

Edit

1,



Edit Commit

1,



Edit Commit Publish

1,


Feature Branch
„Every feature on a branch“

1,


1,


master

1,


feature-x

master

1,


feature-x

master
DAG (Directed Acyclic Graph)

1,


master
feature-y

git checkout feature-y git rebase master

1,


master

feature-y
git checkout feature-y git rebase master

1,


Branch and Rebase

Commit

1,


Branch and Rebase

Commit Rebase

1,


Branch and Rebase

Commit Rebase Merge

1,


Interactive Rebasing

git rebase -i bf0225ae pick / rotate squash

1,



feature-y

1,



bf0255ae

feature-y

1,


„Never rebase branches that you pulled or
pushed. Rebase local branches only!“

1,


Index

1,


$ 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")

1,


working directory index repository

1,



git add [ﬁle]

1,



git add [ﬁle]

git stage [ﬁle]

1,



git add [ﬁle]

git stage [ﬁle]

git commit

1,



git add [ﬁle]

git stage [ﬁle]

git commit

git commit -a

1,


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

1,


New concepts
New possibilities

1,


Project

1,


externe Module

submodules
1,


phpBB

git init phpBB

git submodule add git://..../zf2.git Zend Framework 2

1,


phpBB

git.zendframework.com
Zend Framework 2

git init phpBB

git submodule add git://..../zf2.git Zend Framework 2

1,


phpBB

Zend Framework 2 git.zendframework.com

Symfony 2 git.github.com

git clone git submodule init git submodule update

1,


mr obvious says: Git is not subversion

1,


system integration

Administration
1,


Windows
1,


CRLF

1,


CRLF

I There is no svn:eol-style

1,


CRLF


I Modiﬁcations but no commit possible?

1,


CRLF


I git conﬁg core.autocrlf true

1,


CRLF


I git conﬁg core.autocrlf true
I git help conﬁg

1,


FileMode

1,


FileMode

I Windows Share or FAT ﬁlesystem change your exec bit?

1,


FileMode

I Windows Share or FAT filesystem change your exec bit?
I git config core.fileMode false to the rescue

1,


Server

1,


Server

I No git daemon

1,


Server

I No git daemon
I No symlinks (FAT ﬁlesystem)

1,


Server

I No git daemon
I No symlinks (FAT ﬁlesystem)
I git conﬁg core.symlinks true

1,


Reﬂog

1,


Reﬂog

I Your No 1. tool for recovery

1,


Reﬂog

I Your No 1. tool for recovery

I learn it, it‘s IMPORTANT!

1,


HEAD@{1}
git checkout test git checkout master git branch -D test

1,


Git can be tricky...
...but it‘s simple once you
understood it.

1,


Summary

1,


Summary

I DAG and Rebase

1,


Summary

I DAG and Rebase
I Index

1,


Summary

I DAG and Rebase
I Index
I Submodule

1,


Summary

I DAG and Rebase
I Index
I Submodule
I Reﬂog

1,


More....

1,


More....

I Concepts

1,


More....

I Concepts
I Storage format

1,


More....

I Concepts
I Storage format
I Refspecs

1,


More....

I Concepts
I Storage format
I Refspecs
I Remotes

1,


More....

I Concepts
I Storage format
I Refspecs
I Remotes
I Cool features

1,


More....

I Concepts
I Storage format
I Refspecs
I Remotes
I Cool features
I Bisect

1,


More....

I Concepts
I Storage format
I Refspecs
I Remotes
I Cool features
I Bisect
I Notes

1,


Advanced Git

Weitere ähnliche Inhalte

Empfohlen

Advanced Git