Skip to content

Commit 25c0e88

Browse files
committed
Merge remote branch 'jnavila/master'
Conflicts: fr/01-introduction/01-chapter1.markdown
2 parents 459a07e + 9bc06ca commit 25c0e88

File tree

10 files changed

+7089
-116
lines changed

10 files changed

+7089
-116
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.graffle binary

fr/01-introduction/01-chapter1.markdown

+116-116
Large diffs are not rendered by default.

fr/02-git-basics/01-chapter2.markdown

+1,121
Large diffs are not rendered by default.

fr/03-git-branching/01-chapter3.markdown

+598
Large diffs are not rendered by default.

fr/04-git-server/01-chapter4.markdown

+710
Large diffs are not rendered by default.

fr/05-distributed-git/01-chapter5.markdown

+897
Large diffs are not rendered by default.

fr/06-git-tools/01-chapter6.markdown

+1,109
Large diffs are not rendered by default.

fr/07-customizing-git/01-chapter7.markdown

+875
Large diffs are not rendered by default.

fr/08-git-and-other-scms/01-chapter8.markdown

+685
Large diffs are not rendered by default.

fr/09-git-internals/01-chapter9.markdown

+977
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)