git scm in one hour

basics of git

Transcript

1. GIT SCM IN ONE HOUR Grzegorz Wilczyński" twitter.com/wilq_
2. SCM http://sodiumlightsthehorizon.co.uk/cms/wp-content/uploads/2010/09/13357-ba33a2-500-407.jpg
3. SVN Server Client 1 Client 2 Client 3
4. GIT Client 1 Client 2 Client 3
5. Setup ❖ git config --global user.name "Your Name"" ❖ git config --global user.email "your_email@whatever.com"" ❖ Unix users:! ❖ git config --global core.autocrlf input" ❖ git config --global core.safecrlf true" ❖ Windows users:! ❖ git config --global core.autocrlf true" ❖ git config --global core.safecrlf true
6. Practice ❖ git clone git@github.com:gwilczynski/git-scm-in-one-hour.git" ❖ git status" ❖ vim cupcake.txt" ❖ git add --all" ❖ git commit -m "added cupcake"" ❖ git push
7. Practice ❖ git log! ! ❖ commit 8e222b5bd022d0250795472f8ee9a415b74b87d0" ❖ Author: Grzegorz Wilczynski <gwilczynski@gmail.com>" ❖ Date: Tue Feb 4 22:43:06 2014 +0100" ❖ added cupcake" ! ❖ commit 6eb8670d1a6b877f7318a7389e79475617c05aea" ❖ Author: Grzegorz Wilczyński <gwilczynski@users.noreply.github.com>" ❖ Date: Tue Feb 4 12:53:28 2014 -0800" ❖ Initial commit
8. Practice ❖ git checkout -b pink-team" ❖ git push origin pink-team" ❖ git checkout -b pink-team origin/pink-team -t" ❖ git merge pink-team
9. Practice ❖ Auto-merging cupcake.txt" ❖ CONFLICT (content): Merge conflict in cupcake.txt" ❖ Automatic merge failed; fix conflicts and then commit the result.
10. Practice ❖ <<<<<<< HEAD" ❖ Cupcake test dolor " ❖ =======" ❖ Rose ipsum dolor " ❖ >>>>>>> pink-team
11. Practice ❖ git checkout 8e222b5bd022d0250795472f8ee9a415b74b87d0
12. Sources ❖ http://gitimmersion.com/" ❖ http://git-scm.com/