Merge branch 'prefaces'

.gitignore

@@ -9,3 +9,4 @@ progit.pdfmarks
 progit.epub
 progit-kf8.epub
 progit.mobi
+contributors.txt

.mailmap

@@ -0,0 +1,2 @@
+Jean-Noël Avila <[email protected]>
+Scott Chacon <[email protected]>

.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+git:
+  depth: false
 cache: bundler
 before_install:
 - bundle install

Rakefile

@@ -1,6 +1,10 @@
 namespace :book do
   desc 'build basic book formats'
   task :build do
+
+    puts "Generating contributors list"
+    `git shortlog -s --all| grep -v -E "(Straub|Chacon)" | cut -f 2- | column -c 120 > book/contributors.txt`
+
     puts "Converting to HTML..."
     `bundle exec asciidoctor progit.asc`
     puts " -- HTML output at progit.html"

book/contributors.asc

@@ -3,100 +3,8 @@
 
 Since this is an Open Source book, we have gotten several errata and content changes donated over the years. Here are all the people who have contributed to the English version of Pro Git as an open source project. Thank you everyone for helping make this a better book for everyone.
 
-[source]
+[source,tabsize=8]
 ----
- 2  Aaron Schumacher
- 4  Aggelos Orfanakos
- 4  Alec Clews
- 1  Alex Moundalexis
- 2  Alexander Harkness
- 1  Alexander Kahn
- 1  Andrew McCarthy
- 1  AntonioK
- 1  Benjamin Bergman
- 1  Brennon Bortz
- 2  Brian P O'Rourke
- 1  Bryan Goines
- 1  Cameron Wright
- 1  Chris Down
- 1  Christian Kluge
- 1  Christoph Korn
- 2  Ciro Santilli
- 2  Cor
- 1  Dan Croak
- 1  Dan Johnson
- 1  Daniel Kay
- 2  Daniel Rosen
- 1  DanielWeber
- 1  Dave Dash
-10  Davide Fiorentino lo Regio
- 2  Dilip M
- 1  Dimitar Bonev
- 1  Emmanuel Trillaud
- 1  Eric-Paul Lecluse
- 1  Eugene Serkin
- 1  Fernando Dobladez
- 2  Gordon McCreight
- 1  Helmut K. C. Tessarek
-31  Igor Murzov
- 1  Ilya Kuznetsov
- 1  Jason St. John
- 1  Jay Taggart
- 1  Jean Jordaan
-51  Jean-Noël Avila
- 1  Jean-Noël Rouvignac
- 1  Jed Hartman
- 1  Jeffrey Forman
- 1  John DeStefano
- 1  Junior
- 1  Kieran Spear
- 1  Larry Shatzer, Jr
- 1  Linquize
- 1  Markus
- 7  Matt Deacalion Stevens
- 1  Matthew McCullough
- 1  Matthieu Moy
- 1  Max F. Albrecht
- 1  Michael Schneider
- 8  Mike D. Smith
- 1  Mike Limansky
- 1  Olivier Trichet
- 1  Ondrej Novy
- 6  Ori Avtalion
- 1  Paul Baumgart
- 1  Peter Vojtek
- 1  Philipp Kempgen
- 2  Philippe Lhoste
- 1  PowerKiKi
- 1  Radek Simko
- 1  Rasmus Abrahamsen
- 1  Reinhard Holler
- 1  Ross Light
- 1  Ryuichi Okumura
- 1  Sebastian Wiesinger
- 1  Severyn Kozak
- 1  Shane
- 2  Shannen
- 8  Sitaram Chamarty
- 5  Soon Van
- 4  Sven Axelsson
- 2  Tim Court
- 1  Tuomas Suutari
- 1  Vlad Gorodetsky
- 3  W. Trevor King
- 1  Wyatt Carss
- 1  Włodzimierz Gajda
- 1  Xue Fuqiao
- 1  Yue Lin Ho
- 2  adelcambre
- 1  anaran
- 1  bdukes
- 1  burningTyger
- 1  cor
- 1  iosias
- 7  nicesw123
- 1  onovy
- 2  pcasaretto
- 1  sampablokuper
+include::contributors.txt[]
 ----
 

book/dedication.asc

@@ -0,0 +1,8 @@
+[dedication]
+== Dedications
+
+_To my wife, Becky, without whom this adventure never would have begun. — Ben_
+
+_This edition is dedicated to my girls.
+To my wife Jessica who has supported me for all of these years and to my daughter Josephine,
+who will support me when I'm too old to know what's going on. — Scott_

book/license.asc

@@ -0,0 +1,4 @@
+[preface]
+== Licence
+
+include::../LICENSE.asc[]

book/preface_ben.asc

@@ -0,0 +1,8 @@
+[preface]
+== Preface by Ben Straub
+
+The first edition of this book is what got me hooked on Git. This was my introduction to a style of making software that felt more natural than anything I had seen before. I had been a developer for several years by then, but this was the right turn that sent me down a much more interesting path than the one I was on.
+
+Now, years later, I'm a contributor to a major Git implementation, I've worked for the largest Git hosting company, and I've traveled the world teaching people about Git. When Scott asked if I'd be interested in working on the second edition, I didn't even have to think.
+
+It's been a great pleasure and privilege to work on this book. I hope it helps you as much as it did me.

book/preface.asc → book/preface_schacon.asc

@@ -1,10 +1,3 @@
-Pro Git
-=======
-:doctype:   book
-:docinfo:
-:toc:
-:toclevels: 2
-
 [preface]
 == Preface by Scott Chacon
 
@@ -39,21 +32,3 @@ It's been amazing to watch Git grow over the past few years from a relatively ob
 
 I hope you enjoy this updated edition of Pro Git.
 
-[preface]
-== Preface by Ben Straub
-
-The first edition of this book is what got me hooked on Git. This was my introduction to a style of making software that felt more natural than anything I had seen before. I had been a developer for several years by then, but this was the right turn that sent me down a much more interesting path than the one I was on.
-
-Now, years later, I'm a contributor to a major Git implementation, I've worked for the largest Git hosting company, and I've traveled the world teaching people about Git. When Scott asked if I'd be interested in working on the second edition, I didn't even have to think.
-
-It's been a great pleasure and privilege to work on this book. I hope it helps you as much as it did me.
-
-
-[preface]
-== Dedications
-
-_To my wife, Becky, without whom this adventure never would have begun. — Ben_
-
-_This edition is dedicated to my girls.
-To my wife Jessica who has supported me for all of these years and to my daughter Josephine,
-who will support me when I'm too old to know what's going on. — Scott_

progit.asc

@@ -1,15 +1,26 @@
 Pro Git
 =======
-:doctype:   book
+:doctype: book
 :docinfo:
 :toc:
 :toclevels: 2
 :pagenums:
 :front-cover-image: image:book/cover.png[width=1050,height=1600]
 
-include::book/preface.asc[]
 ifdef::ebook-format[:leveloffset: -1]
 
+include::book/license.asc[]
+
+include::book/preface_schacon.asc[]
+
+include::book/preface_ben.asc[]
+
+include::book/dedication.asc[]
+
+include::book/contributors.asc[]
+
+include::book/introduction.asc[]
+
 include::ch01-getting-started.asc[]
 
 include::ch02-git-basics-chapter.asc[]