From e51c8c3df3cb5421bfd929fc2c5faff63e2728fd Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Mon, 10 Jun 2013 12:32:46 +0200 Subject: [PATCH 1/2] Link to GitMinutes interviews I've published all the recordings I made at Git Merge for GitMinutes. Could they be published here? --- docs/02-index.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/02-index.md b/docs/02-index.md index f5cf146..7723b99 100644 --- a/docs/02-index.md +++ b/docs/02-index.md @@ -6,3 +6,26 @@ This is not just for the User Day, but also for the Developer and Hack Days. * Axel "Pike" Hecht: [git merge 2013](https://blog.mozilla.org/axel/2013/05/13/git-merge-2013/) * Jan-Erik "badboy" Rediger: [git merge 2013](http://fnordig.de/2013/05/11/git-merge/) * Thomas "charon" Rast: [Photos git-merge 2013](http://thomasrast.ch/pix/foss/20130509_gitmerge/) + +# Audio-interviews via [GitMinutes](http://www.gitminutes.com): + +* [Part 1](http://episodes.gitminutes.com/2013/05/gitminutes-09-git-merge-2013-part-1.html) + - Maximilian Haack: About Git Merge and his thesis for visualizing Git + - Ben Straub: About libgit2 + - Jeff “Peff” King: Git core development, improving performance +* [Part 2](http://episodes.gitminutes.com/2013/05/gitminutes-09-git-merge-2013-part-1.html) + - Scott Chacon: Git community + - Mislav Marohnić: Passion of Git users. Hub. Git tips. Merge vs rebase + - Thomas Rast: Git internals, git-notes, git log -L, developing Git +* [Part 3](http://episodes.gitminutes.com/2013/05/gitminutes-09-git-merge-2013-part-1.html) + - Alfonso Alba García: The Spanish Git community, AprendeGit + - Andrey Devyatkin: Large Git migrations at Ericsson + - Jens Lehmann: Git submodules + - Christian Halstrick: About JGit +* [Part 4](http://episodes.gitminutes.com/2013/05/gitminutes-09-git-merge-2013-part-1.html) + - Michael Haggerty: git imerge + - Christian Couder: git bisect + - Michael Diers: Consulting on Git & processes + - Valentin Haenel: German Git book + - Carlos Martín Nieto: libgit2 + - Nico von Geyso: pygit2 From 676cab070d11990825aed643104b18b71b10c3c9 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Mon, 10 Jun 2013 13:46:59 +0300 Subject: [PATCH 2/2] Correct urls Copy paste fail. --- docs/02-index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/02-index.md b/docs/02-index.md index 7723b99..5258990 100644 --- a/docs/02-index.md +++ b/docs/02-index.md @@ -13,16 +13,16 @@ This is not just for the User Day, but also for the Developer and Hack Days. - Maximilian Haack: About Git Merge and his thesis for visualizing Git - Ben Straub: About libgit2 - Jeff “Peff” King: Git core development, improving performance -* [Part 2](http://episodes.gitminutes.com/2013/05/gitminutes-09-git-merge-2013-part-1.html) +* [Part 2](http://episodes.gitminutes.com/2013/05/gitminutes-10-git-merge-2013-part-2.html) - Scott Chacon: Git community - Mislav Marohnić: Passion of Git users. Hub. Git tips. Merge vs rebase - Thomas Rast: Git internals, git-notes, git log -L, developing Git -* [Part 3](http://episodes.gitminutes.com/2013/05/gitminutes-09-git-merge-2013-part-1.html) +* [Part 3](http://episodes.gitminutes.com/2013/06/gitminutes-11-git-merge-2013-part-3.html) - Alfonso Alba García: The Spanish Git community, AprendeGit - Andrey Devyatkin: Large Git migrations at Ericsson - Jens Lehmann: Git submodules - Christian Halstrick: About JGit -* [Part 4](http://episodes.gitminutes.com/2013/05/gitminutes-09-git-merge-2013-part-1.html) +* [Part 4](http://episodes.gitminutes.com/2013/06/gitminutes-12-git-merge-2013-part-4.html) - Michael Haggerty: git imerge - Christian Couder: git bisect - Michael Diers: Consulting on Git & processes