| commit | b57fc8b5f6f925f0fcd2459d1c9226b80716bfbc | |
| author | Scott Chacon <schacon@gmail.com> | |
| Mon, 14 Sep 2009 16:16:54 +0000 (14 09:16 -0700) | ||
| committer | Scott Chacon <schacon@gmail.com> | |
| Mon, 14 Sep 2009 16:16:54 +0000 (14 09:16 -0700) | ||
| tree | b160db38944767d8a4535d4fe3f6642ffa9fa0d8 | treesnapshot (tar.gz zip) |
| parent | 3cd994ef38c551784f6adf5b0ed8304c53b29d1b | commitdiff |
| parent | a38e31d3d10f134c5f2dacbb7cee2a04b3b58bdb | commitdiff |
Merge remote branch 'svenfuchs/master'
Conflicts:
de/05-distributed-git/01-chapter5.markdown
de/06-git-tools/01-chapter6.markdown
de/NOTES
Conflicts:
de/05-distributed-git/01-chapter5.markdown
de/06-git-tools/01-chapter6.markdown
de/NOTES
| de/06-git-tools/01-chapter6.markdown | diff1 | diff2 | blobhistory |