Smacking Git Around Advanced Git Tricks

Smacking Git Aroundby Scott Chacon

Scott Chacon

github.com/schacon

“Scott Chacon has an understandable but borderline unhealthy obsession with Git”

- Ilya Grigorikigvita.com

git-scm.com

book.git-scm.com

schacon@gmail.com

previously, on Git...

image by matthew mccullough

Scott ChaconScott Chacon

is a Git

commit size

98ca9..

author

committer

initial commit of my project

commit size

34ac2..

parent

author

committerfixed bug #1328 - stack

overflow under certain

commit size

f30ab..

parent

author

committeradd feature #32 - ability to

add new formats to the central

snapshot A snapshot B snapshot C

blob size

e8455..commit size

98ca9..

== LICENSE:

(The MIT License)

Permission is hereby granted, f

ree of charge, to any person ob

parent

author

committermy commit message goes here

and it is really, really cool

tree size

10af9..

mylib.rb

tree size

b70f8..

blob 0ad1a tricks.rb

tree size

0de24..

README

blob size

bc52a..

require 'grit/index'

require 'grit/status'

module Grit

class << self

attr_accessor :debug

blob size

0ad1a..

require 'grit/git-ruby/reposi

require 'grit/git-ruby/file_i

module Grit

module Tricks

0de24..

blob size

e8455..commit size

98ca9..

== LICENSE:

(The MIT License)

Permission is hereby granted, f

ree of charge, to any person ob

parent

author

committermy commit message goes here

and it is really, really cool

tree size

10af9..

mylib.rb

tree size

b70f8..

blob 0ad1a tricks.rb

tree size

0de24..

README

blob size

bc52a..

require 'grit/index'

require 'grit/status'

module Grit

class << self

attr_accessor :debug

blob size

0ad1a..

require 'grit/git-ruby/reposi

require 'grit/git-ruby/file_i

module Grit

module Tricks

0de24..

0de24..22d8858e8513666bf91b82bd2939ec7b0d1974da

master

stable

master

stable

master

stable

master

stable

$ time git checkout -b newbranchSwitched to a new branch "newbranch"

real 0m0.040suser 0m0.003ssys0m0.008s

$ time git checkout -b newbranchSwitched to a new branch "newbranch"

real 0m0.040suser 0m0.003ssys0m0.008s

master

develop

distributed development

image by matthew mccullough

ccf03da00eca1b60a489354c1278c27f1fbc55dca640106f173c5be59ed5757cf33f568b3e10994fc51a137df64b8ed2f8d84ad62df7b49b1c4099067e06f7f8d471d5ccbe958fcfaef0fc48ff1a3defdafe95908f7b9cbd2697f04544b68904a6c59aac2934b685f5dfd2b12c5d7d35d07c6058640f0581d3b47a90ef9bf2d7bbc5a7cf2b2f27eef4a08f04dbfeee0f5717d9978788da17cd6853316c92744a864734938d4044fc5e713e4818f60ecb4f4605253793a0108438a539f958236dbb9f4ea98b6b70ea00a60fa1439f082128c1ec03ec3c73acab074d316ba82b4879f04de35ffe2ef02d50df0adf184fad861020b6afeeec245afa2f864c72f5c2588295be505f3128a573bfe1d23aec2acef83c34c3cbd8be213e6f8761df038ab0b7c34a9fc4c2c3ce6c8b43798a8088bcc7cf47fdb33a9d79e398220b660f885e7c19d7b734f56900d9b92faad9eb74bedc3cf04aea3d0714150063b133e10ea987c5d95dce4aa2

efficient

100k repos

80k users

</git-recap>

Git Tips and Tricks

Tips and Tricks

Selection and Ranges

Data Munging

Debugging

Customizing

Selection and Ranges

Revision Selection

alternate ways to refer to objects or ranges of objects

Revision Selectionfull sha-1

partial sha-1

branch or tag name

caret parent

tilde spec

blob spec

relative specs

ranges

Full SHA1

6e453f523fa1da50ecb04431101112b3611c6a4d

Partial SHA16e453f523fa1da50ecb04431101112b3611c6a4d

6e453f523fa1da50

Branch, Remote or Tag Name

default

m/cupcake

Caret Parent

default^2

2nd parent of ‘default’

master

5ec47 2f45e 4eadf 2fbb3 18cae

b3be1 a09c6 df2fa c36ae

jess/master

master

jess/master

master^

master

jess/master

master^2

Tilde Spec

default~2

grandparent of ‘default’(parent of the parent)

master

jess/master

master~2

master

jess/master

master^^^2master~2^2

master

jess/master

master

jess/master

Blob Spec

default:path/to/file

blob of that file in ‘default’ commit

Relative Specs

master@{yesterday}

the commit ‘master’ was at yesterday

Relative Specs

master@{5}

the 5th prior value of ‘master’ (locally)

Ranges

ce0e4..e4272

every commit reachable by e4272 that is not reachable by ce034

Ranges

[old]..[new]

every commit reachable by [new] that is not reachable by [old]

Ranges

ce0e4..

everything since a commit

“Reachability”

master

jess/master

jess/master..master

master

jess/master

jess/master..master

master

jess/master

jess/master..master

master

jess/master

jess/master..master

master

jess/master

jess/master..master

master

jess/master

jess/master..master

master

jess/master

master

jess/master

jess/master..master

master

jess/master

jess/master..c36ae

master

jess/master

jess/master..c36ae

master

jess/master

jess/master..c36ae

master

jess/master

jess/master..c36ae

Advanced Log

Log Subsets

what am I going to push?

git log origin/master..

origin/master master HEAD

origin/master

master HEAD

C4origin/master master HEAD

git fetch origin

git log origin/master..HEAD

commit 72d404debaa804fca82fd9cf710fbde48c7305c6Author: Shawn O. Pearce <spearce@spearce.org>Date: Sun Oct 12 13:13:59 2008 -0700

test-lib: fix broken printf b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of printf without a format string. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

commit 969c877506cf8cc760c7b251fef6c5b6850bfc19Author: Jeff King <peff@peff.net>Date: Sun Oct 12 00:06:11 2008 -0400

git apply --directory broken for new files We carefully verify that the input to git-apply is sane, including cross-checking that the filenames we see in "+++" headers match what was provided on the command line of "diff --git". When --directory is used, however, we ended up comparing the unadorned name to one with the prepended root, causing us to complain about a mismatch. We simply need to prepend the root directory, if any, when pulling the name out of the git header. commit ff74126c03a8dfd04e7533573a5c420f2a7112acAuthor: Johannes Schindelin <Johannes.Schindelin@gmx.de>Date: Fri Oct 10 13:42:12 2008 +0200

rebase -i: do not fail when there is no commit to cherry-pick

commit 72d404debaa804fca82fd9cf710fbde48c7305c6Author: Shawn O. Pearce <spearce@spearce.org>Date: Sun Oct 12 13:13:59 2008 -0700

test-lib: fix broken printf b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of printf without a format string. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

commit 969c877506cf8cc760c7b251fef6c5b6850bfc19Author: Jeff King <peff@peff.net>Date: Sun Oct 12 00:06:11 2008 -0400

git apply --directory broken for new files We carefully verify that the input to git-apply is sane, including cross-checking that the filenames we see in "+++" headers match what was provided on the command line of "diff --git". When --directory is used, however, we ended up comparing the unadorned name to one with the prepended root, causing us to complain about a mismatch. We simply need to prepend the root directory, if any, when pulling the name out of the git header. commit ff74126c03a8dfd04e7533573a5c420f2a7112acAuthor: Johannes Schindelin <Johannes.Schindelin@gmx.de>Date: Fri Oct 10 13:42:12 2008 +0200

rebase -i: do not fail when there is no commit to cherry-pick

git log HEADorigin/master ..

git log HEAD origin/master..

“commits in origin/master not in HEAD”

git log origin/master..master

git log master ^origin/master

git log master --not origin/master

git log HEAD ^origin/master

git log master topic1 ^origin/master

origin/master

master

origin/master

master

experiment

origin/master

origin/mastermaster

experiment

which changes aren’t in experiment?

origin/mastermaster

experiment

git log origin/master master ^experiment

origin/mastermaster

experiment

origin/mastermaster

experiment

origin/mastermaster

experiment

origin/mastermaster

experiment

origin/mastermaster

experiment

origin/mastermaster

experiment

git log --graph

git log --pretty=oneline --graph

gitk 6d13f..41aba

Revision Diffs

git diff revA revB

master

$ echo ‘version one’ > test$ git add test$ git commit -m ‘C1’

$ git checkout -b topic$ echo ‘version two’ >> test$ git commit -m ‘C2’

C2master

$ echo ‘version three’ >> test$ git commit -m ‘C3’

master

$ git checkout master$ echo ‘version four’ >> test$ git commit -m ‘C4’

C3master

$ echo ‘version five’ >> test$ git commit -m ‘C5’

master topic

$ git diff topic

master topic

what does topic have that I don’t have?

$ git diff topic

master topic

what would happen if I merged in topic?

$ git diff topic

master topic

how do I make topic look like HEAD?

$ git diff topic

master topicdiff --git a/test b/testindex 304313d..bd8c6c9 100644--- a/test+++ b/test@@ -1,3 +1,3 @@ version one-version two-version three+version four+version five

$ git diff topic

master topicdiff --git a/test b/testindex 304313d..bd8c6c9 100644--- a/test+++ b/test@@ -1,3 +1,3 @@ version one-version two-version three+version four+version five

$ git diff HEAD topic

master topicdiff --git a/test b/testindex bd8c6c9..304313d 100644--- a/test+++ b/test@@ -1,3 +1,3 @@ version one-version four-version five+version two+version three

git diff HEAD topic

git diff HEAD...topic

master topic

$ git diff HEAD...topic

master topic

diff --git a/test b/testindex 9bc69cf..304313d 100644--- a/test+++ b/test@@ -1 +1,3 @@ version one+version two+version three

master topic

diff --git a/test b/testindex 9bc69cf..304313d 100644--- a/test+++ b/test@@ -1 +1,3 @@ version one+version two+version three

what would happen if I merged in topic?

Data Munging

Rewriting History

Modifying the last commit

git commit --amend

Rebasing

master topic

git merge masterC1

master

master topic

git rebase master

master topic

git rebase master

master topic

git rebase master

master topic

git rebase master

master topic

git rebase master

git diff c2 c3 > 2-3.patch

diff --git a/test b/testindex 2eadcec..bd8c6c9 100644--- a/test+++ b/test@@ -1,2 +1,3 @@ version one version four+version fiveC1

master topic

git rebase master

2-3.patchC1

master topic

2-3.patchC1

master topic

2-3.patchC1

master topic

git diff c1 c2 > 1-2.patch1-2.patch

1-2.patch

2-3.patchC1

master topic

1-2.patch

2-3.patchC1

master topic

git rebase master

2-3.patchC1

master topic

git rebase master

1-2.patch

2-3.patch

git rebase master

master

2-3.patchgit rebase master

master

git rebase master

master

git rebase master

master

git rebase master

master

C5master

git rebase master

C5master

Fun with Rebasing

rebase --onto

Transplanting Topic Branches

master

server

client

master

server

client

master

C1 C2 C5

server

master

client

move your ‘client’ branch work to your

‘master’ branch

C1 C2 C5

server

master

client

C1 C2 C5

server

master

client

C1 C2 C5

server

master

client

git rebase master

C1 C2 C5

server

master

client

git rebase master

C1 C2 C5

server

master

client

git rebase master

C1 C2 C5

server

master

client

git rebase master

C1 C2 C5

server

master

client

git rebase server

C1 C2 C5

server

master

client

git rebase server

C1 C2 C5

server

master

client

git rebase server

C1 C2 C5

server

master

client

git rebase server

C1 C2 C5

server

master

client

git rebase --onto master server

C1 C2 C5

server

master

client

C1 C2 C5

server

master

client

C1 C2 C5

server

master

client

C8 C9C1 C2 C5

server

master

C8' C9'

client

C1 C2 C5

server

master

client

C1 C2 C5

server

master

C8' C9'

client

C1 C2 C5

server

master

C8' C9'

client

git checkout servergit rebase master

C1 C2 C5

server

master

C8' C9'

client

git checkout servergit rebase client

C1 C2 C5

server

master

C8' C9'

client

C1 C2 C5

server

master

C8' C9'

client

C1 C2 C5 C6 C8' C9'

client

C3' C4' C10'

C1 C2 C5 C6 C8' C9'

client

C3' C4' C10'C1 C2 C5 C6 C8' C9'

client server

C3' C4' C10'

master

C1 C2 C5 C6 C8' C9'

client server

C3' C4' C10'

master

transplant some of a topic branch

C1C0 C2

master

C1C0 C2

master

git branch newtopic C3

C1C0 C2

master

git branch newtopic C3

newtopic

C1C0 C2

master

git branch newtopic C3git rebase --onto master newtopic

newtopic

C1C0 C2

master

C1C0 C2

master topic

C4' C5'

git branch newtopic C3git rebase --onto master newtopic

newtopic

Fixing a commit several back

git rebase -igit rebase --interactive

default

default~2

default

default~2

git rebase -i default~2^

pick 969c877 git apply --directory broken for new filespick b75271d git diff <tree>{3,}: do not reverse order of argspick 72d404d test-lib: fix broken printf

# Rebase f285a2d..5c283eb onto f285a2d## Commands:# p, pick = use commit# e, edit = use commit, but stop for amending# s, squash = use commit, but meld into previous commit## If you remove a line here THAT COMMIT WILL BE LOST.# However, if you remove everything, the rebase will be aborted.#~ ~ ~ ~ ~ "~/projects/git/.git/rebase-merge/git-rebase-todo" 14L, 472C

edit 969c877 git apply --directory broken for new filespick b75271d git diff <tree>{3,}: do not reverse order of argspick 72d404d test-lib: fix broken printf

$ git rebase -i default~2^Stopped at 969c877... git apply --directory broken for new filesYou can amend the commit now, with

git commit --amend

Once you are satisfied with your changes, run

git rebase --continue

git commit --amend

edit filesgit add

git commit --amendgit rebase --continue

git commit --amend

edit filesgit add

git commit --amend

edit filesgit add

git commit --amend

edit filesgit add

default

Squashing commits together

pick 969c877 git apply --directory broken for new filessquash b75271d git diff <tree>{3,}: do not reverse order of argssquash 72d404d test-lib: fix broken printf

# This is a combination of 3 commits.# The first commit's message is:git apply --directory broken for new files

# This is the 2nd commit message:

git diff <tree>{3,}: do not reverse order of args

# This is the 3rd commit message:

test-lib: fix broken printf

# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.## Author: Jeff King <peff@peff.net>## Not currently on any branch.# Changes to be committed:# (use "git reset HEAD <file>..." to unstage)## modified: builtin-apply.c# modified: builtin-diff.c# modified: t/t4013-diff-various.sh# new file: t/t4013/diff.diff_master_master^_side# modified: t/t4128-apply-root.sh# modified: t/test-lib.sh#~ ~ ".git/COMMIT_EDITMSG" 39L, 1454C

default

The Perils

default

scott jessica

default

scott jessica

scott/default

default

scott jessica

scott/default default

default

scott jessica

scott/default

default

scott jessica

scott/default

default

scott jessica

scott/default

default

scott jessica

scott/default

default

Filter BranchHistory Revision on Steroids

remove all instances of a file from every commit

git filter-branch --tree-filter 'rm -f filename'

change your email in all commits

git filter-branch --env-filter "export GIT_AUTHOR_EMAIL=you@email.com"

origin/master..HEAD

Subtree Merging

Alternative to Submodules

$ lsREADME rack_app.rb $ git remote add rack_remote git@github.com:schacon/rack.git$ git fetch rack_remotewarning: no common commitsremote: Counting objects: 3184, done.remote: Compressing objects: 100% (1465/1465), done.remote: Total 3184 (delta 1952), reused 2770 (delta 1675)Receiving objects: 100% (3184/3184), 677.42 KiB | 4 KiB/s, done.Resolving deltas: 100% (1952/1952), done.From git@github.com:schacon/rack * [new branch] master -> rack_remote/master$ git checkout -b rack_branch rack_remote/masterBranch rack_branch set up to track remote branch refs/remotes/rack_remote/master.Switched to a new branch "rack_branch"$ lsAUTHORS KNOWN-ISSUES Rakefile contrib libCOPYING README bin example test

master

$ lsREADME rack_app.rb $ git remote add rack_remote git@github.com:schacon/rack.git$ git fetch rack_remotewarning: no common commitsremote: Counting objects: 3184, done.remote: Compressing objects: 100% (1465/1465), done.remote: Total 3184 (delta 1952), reused 2770 (delta 1675)Receiving objects: 100% (3184/3184), 677.42 KiB | 4 KiB/s, done.Resolving deltas: 100% (1952/1952), done.From git@github.com:schacon/rack * [new branch] master -> rack_remote/master$ git checkout -b rack_branch rack_remote/masterBranch rack_branch set up to track remote branch refs/remotes/rack_remote/master.Switched to a new branch "rack_branch"$ lsAUTHORS KNOWN-ISSUES Rakefile contrib libCOPYING README bin example test

master

rack_branch

rack_remote/master

$ git checkout master$ lsREADME rack_app.rb $ git checkout rack_branch$ lsAUTHORS KNOWN-ISSUESRakefile contrib libCOPYING README bin example test

checkout ‘rack’ into my project

$ git read-tree --prefix=rack/ -u rack_branch$ lsREADME rack rack_app.rb$ ls rackAUTHORS KNOWN-ISSUESRakefilecontrib libCOPYING README bin example test$ git add rack$ git commit -m 'added rack code'[master 0839fd8] added rack code 108 files changed, 10334 insertions(+), 0 deletions(-) create mode 100644 rack/AUTHORS create mode 100644 rack/COPYING ... create mode 100644 rack/test/testrequest.rb

edit a file in rack

$ vim rack/lib/rack.rb $ git commit -am 'added awesome to rack'[master b1b77ee] added awesome to rack 1 files changed, 1 insertions(+), 0 deletions(-)$ git checkout rack_branch$ git merge --squash -s subtree --no-commit masterSquash commit -- not updating HEADAutomatic merge went well; stopped before committing as requested$ git status# On branch rack_branch# Changes to be committed:# (use "git reset HEAD <file>..." to unstage)## modified: lib/rack.rb#

submit the change back to rack

$ vim rack/lib/rack.rb $ git commit -am 'added awesome to rack'[master b1b77ee] added awesome to rack 1 files changed, 1 insertions(+), 0 deletions(-)$ git checkout rack_branch$ git merge --squash -s subtree --no-commit masterSquash commit -- not updating HEADAutomatic merge went well; stopped before committing as requested$ git status# On branch rack_branch# Changes to be committed:# (use "git reset HEAD <file>..." to unstage)## modified: lib/rack.rb#

git merge -s subtree

$ vim rack/lib/rack.rb $ git commit -am 'added awesome to rack'[master b1b77ee] added awesome to rack 1 files changed, 1 insertions(+), 0 deletions(-)$ git checkout rack_branch$ git merge -s subtree --no-commit --squash masterSquash commit -- not updating HEADAutomatic merge went well; stopped before committing as requested$ git status# On branch rack_branch# Changes to be committed:# (use "git reset HEAD <file>..." to unstage)## modified: lib/rack.rb#

git merge -s subtree --no-commit --squash master

really?

http://dysinger.net/2008/04/29/replacing-braid-or-piston-for-git-with-40-lines-of-rake/

Tim Dysinger

http://dysinger.net/2008/04/29/replacing-braid-or-piston-for-git-with-40-lines-of-rake/

http://tinyurl.com/braidgit

Tim Dysinger

Patch Staging

git add -p

$ 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: ticgit.gemspec#no changes added to commit (use "git add" and/or "git commit -a")

$ git add -pdiff --git a/ticgit.gemspec b/ticgit.gemspecindex 9c32bd4..a44667b 100644--- a/ticgit.gemspec+++ b/ticgit.gemspec@@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = "ticgit"- s.version = "0.3.5"+ s.version = "0.3.6" s.date = "2008-05-10" s.author = "Scott Chacon" s.email = "schacon@gmail.com"Stage this hunk [y,n,a,d,/,j,J,g,e,?]? y

$ git add -pdiff --git a/ticgit.gemspec b/ticgit.gemspecindex 9c32bd4..a44667b 100644--- a/ticgit.gemspec+++ b/ticgit.gemspec@@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = "ticgit"- s.version = "0.3.5"+ s.version = "0.3.6" s.date = "2008-05-10" s.author = "Scott Chacon" s.email = "schacon@gmail.com"Stage this hunk [y,n,a,d,/,j,J,g,e,?]?

$ git add -pdiff --git a/ticgit.gemspec b/ticgit.gemspecindex 9c32bd4..a44667b 100644--- a/ticgit.gemspec+++ b/ticgit.gemspec@@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = "ticgit"- s.version = "0.3.5"+ s.version = "0.3.6" s.date = "2008-05-10" s.author = "Scott Chacon" s.email = "schacon@gmail.com"Stage this hunk [y,n,a,d,/,j,J,g,e,?]? y

@@ -9,9 +9,10 @@ Gem::Specification.new do |s| s.files = ["lib/ticgit/base.rb", "lib/ticgit/cli.rb", "lib/ticgit/comment.rb", "lib/ticgit/ticket.rb", "lib/ticgit.rb", "bin/ti", "bin/ticgitweb"] s.bindir = 'bin'- s.executables << "ti"- s.executables << "ticgitweb"+ s.executables = ["ti", "ticgitweb"]+ s.default_executable = %q{ti} s.homepage = "http://github/schacon/ticgit" s.require_paths = ["lib", "bin"]+ s.specification_version = 2 if s.respond_to? :specification_version= endStage this hunk [y,n,a,d,/,K,g,s,e,?]?

@@ -9,9 +9,10 @@ Gem::Specification.new do |s| s.files = ["lib/ticgit/base.rb", "lib/ticgit/cli.rb", "lib/ticgit/comment.rb", "lib/ticgit/ticket.rb", "lib/ticgit.rb", "bin/ti", "bin/ticgitweb"] s.bindir = 'bin'- s.executables << "ti"- s.executables << "ticgitweb"+ s.executables = ["ti", "ticgitweb"]+ s.default_executable = %q{ti} s.homepage = "http://github/schacon/ticgit" s.require_paths = ["lib", "bin"]+ s.specification_version = 2 if s.respond_to? :specification_version= endStage this hunk [y,n,a,d,/,K,g,s,e,?]? n

$ git status# On branch master# Changes to be committed:# (use "git reset HEAD <file>..." to unstage)## modified: ticgit.gemspec## 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: ticgit.gemspec#

partially stage files

git add -p

Debugging

Annotation

git blame

git blameie: “what dumbass did this? oh, it was me...”

git blame daemon.c979e32fa (Randal L. Schwartz 2005-10-25 16:29:09 -0700 1) #include "cache.h"85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 2) #include "pkt-line.h"77cb17e9 (Michal Ostrowski 2006-01-10 21:12:17 -0500 3) #include "exec_cmd.h"49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 4) #include "interpolate.h"f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 5) 85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 6) #include <syslog.h>85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 7) 695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 8) #ifndef HOST_NAME_MAX695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 9) #define HOST_NAME_MAX 256695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 10) #endif695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 11) 415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 12) #ifndef NI_MAXSERV415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 13) #define NI_MAXSERV 32415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 14) #endif415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 15) 9048fe1c (Petr Baudis 2005-09-24 16:13:01 +0200 16) static int log_syslog;f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 17) static int verbose;1955fabf (Mark Wooding 2006-02-03 20:27:04 +0000 18) static int reuseaddr;f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 19) 960deccb (H. Peter Anvin 2005-10-19 14:27:01 -0700 20) static const char daemon_usage[] =1b1dd23f (Stephan Beyer 2008-07-13 15:36:15 +0200 21) "git daemon [--verbose] [--syslog] [3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 22) " [--timeout=n] [--init-ti3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 23) " [--strict-paths] [--base73a7a656 (Jens Axboe 2007-07-27 14:00:29 -0700 24) " [--user-path | --user-pa49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 25) " [--interpolated-path=pat678dac6b (Tilman Sauerbeck 2006-08-22 19:37:41 +0200 26) " [--reuseaddr] [--detach]d9edcbd6 (Junio C Hamano 2006-09-07 01:40:04 -0700 27) " [--[enable|disable|allowdd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 28) " [--inetd | [--listen=hosdd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 29) " [--user=user dd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 30) " [directory...]";4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 31) 4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 32) /* List of acceptable pathname prefi96f1e58f (David Rientjes 2006-08-15 10:23:48 -0700 33) static char **ok_paths;96f1e58f (David Rientjes 2006-08-15 10:23:48 -0700 34) static int strict_paths;4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 35) 4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 36) /* If this is set, git-daemon-export96f1e58f (David Rientjes 2006-08-15 10:23:48 -0700 37) static int export_all_trees;

979e32fa (Randal L. Schwartz 2005-10-25 16:29:09 -0700 1) #include "cache.h"85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 2) #include "pkt-line.h"77cb17e9 (Michal Ostrowski 2006-01-10 21:12:17 -0500 3) #include "exec_cmd.h"49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 4) #include "interpolate.h"f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 5) 85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 6) #include <syslog.h>85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 7) 695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 8) #ifndef HOST_NAME_MAX695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 9) #define HOST_NAME_MAX 256695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 10) #endif695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 11) 415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 12) #ifndef NI_MAXSERV415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 13) #define NI_MAXSERV 32415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 14) #endif415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 15) 9048fe1c (Petr Baudis 2005-09-24 16:13:01 +0200 16) static int log_syslog;f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 17) static int verbose;1955fabf (Mark Wooding 2006-02-03 20:27:04 +0000 18) static int reuseaddr;f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 19) 960deccb (H. Peter Anvin 2005-10-19 14:27:01 -0700 20) static const char daemon_usage[] =1b1dd23f (Stephan Beyer 2008-07-13 15:36:15 +0200 21) "git daemon [--verbose] [--syslog] [3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 22) " [--timeout=n] [--init-ti3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 23) " [--strict-paths] [--base73a7a656 (Jens Axboe 2007-07-27 14:00:29 -0700 24) " [--user-path | --user-pa49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 25) " [--interpolated-path=pat678dac6b (Tilman Sauerbeck 2006-08-22 19:37:41 +0200 26) " [--reuseaddr] [--detach]d9edcbd6 (Junio C Hamano 2006-09-07 01:40:04 -0700 27) " [--[enable|disable|allowdd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 28) " [--inetd | [--listen=hosdd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 29) " [--user=user dd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 30) " [directory...]";4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 31) 4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 32) /* List of acceptable pathname prefi96f1e58f (David Rientjes 2006-08-15 10:23:48 -0700 33) static char **ok_paths;96f1e58f (David Rientjes 2006-08-15 10:23:48 -0700 34) static int strict_paths;4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 35) 4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 36) /* If this is set, git-daemon-export96f1e58f (David Rientjes 2006-08-15 10:23:48 -0700 37) static int export_all_trees;

git blame daemon.c

git blame -C GITPackUpload.m

git blame -C GITPackUpload.mf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 12) f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 13) #define PACK_SIGNf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 14) #define PACK_VERSf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 15) ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 16) @implementation Gad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 17) ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 18) @synthesize gitRead11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 19) @synthesize needRad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 20) @synthesize gitSoad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 21) @synthesize refDiad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 22) a2cbabf5 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-25 22:29:39 +0100 23) - (id) initWithGiad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 24) {a2cbabf5 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-25 22:29:39 +0100 25) gitRepo = ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 26) needRefs =ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 27) gitSocket ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 28) return selad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 29) }ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 30) ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 31) - (bool) uploadPaf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 32) {f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 33) NSLog(@"upf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 34) NSString *f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 35) NSArray *tf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 36) 56ef2caf Source/Network/GITServerHandler.m (Scott Chacon 2009-01-05 21:44:26 -0800 37) refDict = f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 38)

f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 12) f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 13) #define PACK_SIGNf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 14) #define PACK_VERSf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 15) ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 16) @implementation Gad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 17) ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 18) @synthesize gitRead11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 19) @synthesize needRad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 20) @synthesize gitSoad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 21) @synthesize refDiad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 22) a2cbabf5 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-25 22:29:39 +0100 23) - (id) initWithGiad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 24) {a2cbabf5 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-25 22:29:39 +0100 25) gitRepo = ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 26) needRefs =ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 27) gitSocket ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 28) return selad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 29) }ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 30) ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 31) - (bool) uploadPaf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 32) {f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 33) NSLog(@"upf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 34) NSString *f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 35) NSArray *tf344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 36) 56ef2caf Source/Network/GITServerHandler.m (Scott Chacon 2009-01-05 21:44:26 -0800 37) refDict = f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 38)

Bisecting

binary search for where a bug was introduced

$ git bisect start$ git bisect bad$ git bisect good 3acb4c2c6666ed6cb91cb0b983efe9d50cf8cfbeBisecting: 6 revisions left to test after this[ecb6e1bc347ccecc5f9350d878ce677feb13d3b2] error handling on repo$ git bisect goodBisecting: 3 revisions left to test after this[b047b02ea83310a70fd603dc8cd7a6cd13d15c04] secure this thing$ git bisect badBisecting: 1 revisions left to test after this[f71ce38690acf49c1f3c9bea38e09d82a5ce6014] drop exceptions table and$ git bisect goodb047b02ea83310a70fd603dc8cd7a6cd13d15c04 is first bad commitcommit b047b02ea83310a70fd603dc8cd7a6cd13d15c04Author: PJ Hyett <pjhyett@gmail.com>Date: Tue Jan 27 14:48:32 2009 -0800

secure this thing

:040000 040000 40ee3e7821b895e52c1695092db9bdc4c61d1730 f24d3c6ebcfc639b1a3814550e62d60b8e68a8e4 M config

secure this thing

$ git bisect start$ git bisect bad$ git bisect good 3acb4c2c6666ed6cb91cb0b983efe9d50cf8cfbeBisecting: 6 revisions left to test after this[ecb6e1bc347ccecc5f9350d878ce677feb13d3b2] error handling on repo$ git bisect goodBisecting: 3 revisions left to test after this[b047b02ea83310a70fd603dc8cd7a6cd13d15c04] secure this thing$ git bisect badBisecting: 1 revisions left to test after this[f71ce38690acf49c1f3c9bea38e09d82a5ce6014] drop exceptions table$ git bisect goodb047b02ea83310a70fd603dc8cd7a6cd13d15c04 is first bad commitcommit b047b02ea83310a70fd603dc8cd7a6cd13d15c04Author: PJ Hyett <pjhyett@gmail.com>Date: Tue Jan 27 14:48:32 2009 -0800

secure this thing

$ git bisect reset

Customizing

Autocorrect

$ git com git: 'com' is not a git-command. See 'git --help'.

Did you mean this? commit

$ git com git: 'com' is not a git-command. See 'git --help'.

Did you mean this? commit

help.autocorrect

$ git config --global help.autocorrect 1

$ git comWARNING: You called a Git program named 'com', which does not exist.Continuing under the assumption that you meant 'commit'

Colors

$ git config --global color.ui true

Custom Merge Tool

perforce visual merge tool

http://www.perforce.com/perforce/products/merge.html

$ cat /usr/local/bin/extMerge #!/bin/sh /Applications/p4merge.app/Contents/MacOS/p4merge $*

$ git config --global merge.tool extMerge

$ git config --global mergetool.extMerge.cmd 'extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'

$ git config --global mergetool.trustExitCode = false

[merge] tool = extMerge[mergetool "extMerge"] cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED" trustExitCode = false

~/.gitconfig

git mergetool

Git Attributes

.gitattributes

Diff Binary Files

Images

diff --git a/image.png b/image.pngindex 88839c4..4afcb7c 100644Binary files a/image.png and b/image.png differ

tell Git how to diff a binary file

exiftool

$ echo '*.png diff=exif' >> .gitattributes$ git config diff.exif.textconv exiftool

every file that ends in .png

pre-process them with a strategy called ‘exif ’

the ‘exif ’ strategy is to run ‘exiftool’ on it

$ exiftool image.png ExifTool Version Number : 7.74File Name : image.pngDirectory : .File Size : 94 kBFile Modification Date/Time : 2009:04:21 07:02:43-07:00File Type : PNGMIME Type : image/pngImage Width : 1056Image Height : 827Bit Depth : 8Color Type : RGB with AlphaCompression : Deflate/InflateFilter : AdaptiveInterlace : NoninterlacedProfile CMM Type : applProfile Version : 2.0.0Profile Class : Display Device ProfileColor Space Data : RGBProfile Connection Space : XYZProfile Date Time : 2009:04:05 12:26:58Profile File Signature : acspPrimary Platform : Apple Computer Inc.CMM Flags : Not Embedded, IndependentDevice Manufacturer : Device Model : Device Attributes : Reflective, Glossy, Positive, ColorRendering Intent : PerceptualConnection Space Illuminant : 0.9642 1 0.82491Profile Creator : applProfile ID : 0Red Matrix Column : 0.39493 0.22505 0.02957Green Matrix Column : 0.42793 0.69208 0.14424Blue Matrix Column : 0.14134 0.08327 0.65096Media White Point : 0.95047 1 1.0891Chromatic Adaptation : 1.04788 0.02292 -0.0502 0.02957 0.99049 -0.01706 -0.00923 0.01508 0.75165Red Tone Reproduction Curve : (Binary data 14 bytes, use -b option to extract)Green Tone Reproduction Curve : (Binary data 14 bytes, use -b option to extract)Blue Tone Reproduction Curve : (Binary data 14 bytes, use -b option to extract)Video Card Gamma : (Binary data 1554 bytes, use -b option to extract)Native Display Info : (Binary data 1598 bytes, use -b option to extract)Profile Description : Color LCDProfile Description ML : Farge-LCDMake And Model : (Binary data 40 bytes, use -b option to extract)Profile Copyright : Copyright Apple, Inc., 2009Pixels Per Unit X : 5906Pixels Per Unit Y : 5906Pixel Units : MetersImage Size : 1056x827

diff --git a/image.png b/image.png index 88839c4..4afcb7c 100644 --- a/image.png +++ b/image.png @@ -1,12 +1,12 @@ ExifTool Version Number : 7.74 -File Size : 70 kB -File Modification Date/Time : 2009:04:21 07:02:45-07:00 +File Size : 94 kB +File Modification Date/Time : 2009:04:21 07:02:43-07:00 File Type : PNG MIME Type : image/png -Image Width : 1058 -Image Height : 889 +Image Width : 1056 +Image Height : 827 Bit Depth : 8 Color Type : RGB with Alpha

Documents

$ echo '*.doc diff=doc' >> .gitattributes$ git config diff.doc.textconv strings

$ git diff diff --git a/chapter1.doc b/chapter1.doc index c1c8a0a..b93c9e4 100644 --- a/chapter1.doc +++ b/chapter1.doc @@ -8,7 +8,8 @@ re going to cover Version Control Systems (VCS) and Git basics re going to cover how to get it and set it up for the first time if you don t already have it on your system. In Chapter Two we will go over basic Git usage - how to use Git for the 80% -s going on, modify stuff and contribute changes. If the book spontaneously +s going on, modify stuff and contribute changes. If the book spontaneously +Let's see if this works. Chapter Three is about the branching model in Git, often described as Git

File Filtering

Staging Area

fileA.txt

fileB.txt

fileC.rb

smudge

*.txt Filter

Staging Area

fileA.txt

fileB.txt

fileC.rb

smudge

*.txt Filter

smudge

*.txt Filter

Staging Area

fileA.txt

fileB.txt

fileC.rb

git checkout

smudge

*.txt Filter

Staging Area Working Directory

fileA.txt

fileB.txt clean

smudge fileA.txt'

fileB.txt'

*.txt Filter

fileC.rb fileC.rb

git checkout

fileA.txt

fileB.txt clean

smudge fileA.txt'

fileB.txt'

*.txt Filter

fileC.rb fileC.rb

fileA.txt

fileB.txt clean

smudge fileA.txt'

fileB.txt'

*.txt Filter

fileC.rb fileC.rb

git commit

fileA.txt

fileB.txt clean

smudge fileA.txt'

fileB.txt'

*.txt Filter

fileC.rb fileC.rb

git commit

fileA.txt

fileB.txt clean

smudge fileA.txt'

fileB.txt'

*.txt Filter

fileC.rb fileC.rb

expanding a $Date$

#! /usr/bin/env rubydata = STDIN.readdate = `git log --pretty=format:"%ad" -1`puts data.gsub('$Date$', '$Date: ' + date + '$')

/usr/bin/expand_date

git config filter.dater.smudge expand_date

git config filter.dater.clean 'perl -pe "s/\\\$Date[^\\\$]*\\\$/\\\$Date\\\$/"'

replace $Date(whatever)$ with $Date$

test it

$ echo '# $Date$' > date_test.rb $ echo 'date*.rb filter=dater' >> .gitattributes

$ git add date_test.rb .gitattributes$ git commit -m "Testing date expansion in Git"$ rm date_test.rb$ git checkout date_test.rb$ cat date_test.rb# $Date: Tue Apr 21 07:26:52 2009 -0700$

use the ‘dater’ filter for any files matching ‘date*.rb’

$ git add date_test.rb .gitattributes$ git commit -m "Testing date expansion in Git"$ rm date_test.rb$ git checkout date_test.rb

$ cat date_test.rb# $Date: Tue Apr 21 07:26:52 2009 -0700$

$ git add date_test.rb .gitattributes$ git commit -m "Testing date expansion in Git"$ rm date_test.rb$ git checkout date_test.rb

$ cat date_test.rb# $Date: Tue Apr 21 07:26:52 2009 -0700$

</tricks></tips>

one more thing...

git server

hg client git clienthg client

hg-git.github.com

http://bitbucket.org/Scotty/hg-git/

http://github.com/schacon/hg-git

$ hg gpush githubpushing to : githubexporting git objectsconverting revision 78creating and sending data github::refs/heads/master : f8cebef6 => ffbc960d

• lossless conversion

• all pushes to GitHub for the project have been through Hg

• have pulled and merged changes introduced on GitHub via Hg

• have pulled and merged changes introduced on BitBucket and pushed back to GitHub

hg-git.github.com

Resourcesgit-scm.com

gitcasts.com

learn.github.com

#git / #github on IRC

peepcode - git book and screencast

schacon@gmail.com

me, in person, tonight, someplace that serves whiskey

Smacking Git Around Advanced Git Tricks

Technology

Transcript of Smacking Git Around Advanced Git Tricks

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 LFS at Autodesk - Meetupfiles.meetup.com/20767392/larsxschneider-gitlfs-at... · Git LFS Tips & Tricks. @kit3bus No line ending conversions on LFS files! Git LFS ...

Git Going w/ Git

Git, smart git & gitflow

Git and git flow

Git Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

Jedi Mind Tricks for Git

Lip smacking starter recipes

Handy Git tricks - Linaro · git status --porcelain (to parse output to scripts, backwards compatible. =v2 for more info) git grep, bisect, describe git fetch -p and git push --mirror.

2012 GIT English - Ape Panthiya GIT English... · 2012 GIT English @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

SMACking Talent Acquisition - cognizant.com

Git Started With Git

The ‘No Smacking’ Guide to Good BehaviourNo+Smacking...The ‘No Smacking’ Guide to Good Behaviour - we all want good children. Bringing up children always means time, effort

Parental Smacking – The Issues and the Law

Tasty and lip-smacking food delivery at Delhi Railway Station

FINGER SMACKING FOOD –

Git - tips and tricks

Chana Masala a lip smacking Indian recipe

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

Want to try lip-smacking seafood paella?