Merge remote branch 'jnavila/master'

Conflicts: fr/01-introduction/01-chapter1.markdown
yhuiyang · Dec 2, 2009 · 25c0e88 · 25c0e88
2 parents 459a07e + 9bc06ca
commit 25c0e88
Show file tree

Hide file tree

Showing 10 changed files with 7,089 additions and 116 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.graffle binary
diff --git a/fr/01-introduction/01-chapter1.markdown b/fr/01-introduction/01-chapter1.markdown
diff --git a/fr/02-git-basics/01-chapter2.markdown b/fr/02-git-basics/01-chapter2.markdown
diff --git a/fr/03-git-branching/01-chapter3.markdown b/fr/03-git-branching/01-chapter3.markdown
diff --git a/fr/04-git-server/01-chapter4.markdown b/fr/04-git-server/01-chapter4.markdown
diff --git a/fr/05-distributed-git/01-chapter5.markdown b/fr/05-distributed-git/01-chapter5.markdown
diff --git a/fr/06-git-tools/01-chapter6.markdown b/fr/06-git-tools/01-chapter6.markdown
diff --git a/fr/07-customizing-git/01-chapter7.markdown b/fr/07-customizing-git/01-chapter7.markdown
diff --git a/fr/08-git-and-other-scms/01-chapter8.markdown b/fr/08-git-and-other-scms/01-chapter8.markdown
diff --git a/fr/09-git-internals/01-chapter9.markdown b/fr/09-git-internals/01-chapter9.markdown