No. 1September 27, 2013
Collaborative development with Git
Vimal Joseph
Technical Architect
No. 2September 27, 2013
Collaborative development with Git
Tracking Changes
User A
User B
D1
D1
Time
D1 D1.1 D1.2 D1.3
No. 3September 27, 2013
Collaborative development with Git
Tracking changes in a document with OpenOffice Writer
No. 4September 27, 2013
Collaborative development with Git
What about developing a software project?
Developer A
Project
R...
No. 5September 27, 2013
Collaborative development with Git
what about developing a software project?
Developer A
Project
R...
No. 6September 27, 2013
Collaborative development with Git
How about developing a software project?
Developer A
Project
Re...
No. 7September 27, 2013
Collaborative development with Git
what about developing a software project?
Developer A Project
R...
No. 8September 27, 2013
Collaborative development with Git
what about developing a software project?
Developer A Project R...
No. 9September 27, 2013
Collaborative development with Git
Softwares for Version Control
• Source Code Control System (SCC...
No. 10September 27, 2013
Collaborative development with Git
Git
• Developers : Junio Hamano and Linus Torvalds and several...
No. 11September 27, 2013
Collaborative development with Git
Distributed Version Control System
No. 12September 27, 2013
Collaborative development with Git
Let's Start the Git
• Introduce yourself to git
– git config –...
No. 13September 27, 2013
Collaborative development with Git
Git Repository
• Create a git repository
– mkdir your-director...
No. 14September 27, 2013
Collaborative development with Git
Structure of Git
No. 15September 27, 2013
Collaborative development with Git
Head, Branches, Tags
No. 16September 27, 2013
Collaborative development with Git
Branching, Merging and tagging
• Create new branch and switch ...
No. 17September 27, 2013
Collaborative development with Git
Working with remote repositaries
• Add a remote repository
– g...
No. 18September 27, 2013
Collaborative development with Git
Patching
• Branch
– git checkout -b fix_the_bug
• Create a pat...
No. 19September 27, 2013
Collaborative development with Git
Working with remote repositaries
• Add a remote repository
– g...
No. 20September 27, 2013
Collaborative development with Git
On-line git hosting
• http://gitorious.org/
• http://github.co...
No. 21September 27, 2013
Collaborative development with Git
Thanks...
• http://git-scm.com/documentation
• questions??
vim...
Upcoming SlideShare
Loading in …5
×

Collaborative development using git, Session conducted at Model Engineering College, Ernakulam on 2013-09-26

1,172 views

Published on

An introuduction to the git version control system.

Published in: Technology
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
1,172
On SlideShare
0
From Embeds
0
Number of Embeds
174
Actions
Shares
0
Downloads
7
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide
  • Note Page by Willem van der Plaat
  • Collaborative development using git, Session conducted at Model Engineering College, Ernakulam on 2013-09-26

    1. 1. No. 1September 27, 2013 Collaborative development with Git Vimal Joseph Technical Architect
    2. 2. No. 2September 27, 2013 Collaborative development with Git Tracking Changes User A User B D1 D1 Time D1 D1.1 D1.2 D1.3
    3. 3. No. 3September 27, 2013 Collaborative development with Git Tracking changes in a document with OpenOffice Writer
    4. 4. No. 4September 27, 2013 Collaborative development with Git What about developing a software project? Developer A Project Repository S/w Developer B
    5. 5. No. 5September 27, 2013 Collaborative development with Git what about developing a software project? Developer A Project Repository S/w User A User D Developer B
    6. 6. No. 6September 27, 2013 Collaborative development with Git How about developing a software project? Developer A Project Repository S/w User A User D BUG Developer B
    7. 7. No. 7September 27, 2013 Collaborative development with Git what about developing a software project? Developer A Project Repository S/w User A User D Developer B Fixed Code (patch)
    8. 8. No. 8September 27, 2013 Collaborative development with Git what about developing a software project? Developer A Project Repository S/w 1.1 User A User DFixed Code (patch) apply Developer B
    9. 9. No. 9September 27, 2013 Collaborative development with Git Softwares for Version Control • Source Code Control System (SCCS) • CVS • Subversion (svn) • Mercurial • Bazaar • Git • Etc...
    10. 10. No. 10September 27, 2013 Collaborative development with Git Git • Developers : Junio Hamano and Linus Torvalds and several other people • Website : http://git-scm.com/ • Linus Torvalds started its development on April 2005 • Distributed Version Control System
    11. 11. No. 11September 27, 2013 Collaborative development with Git Distributed Version Control System
    12. 12. No. 12September 27, 2013 Collaborative development with Git Let's Start the Git • Introduce yourself to git – git config –global user.name “Vimal Joseph” – git config –global user.email “vimal.joseph@zyxware.com” • Add some colour – git config –global color.ui true • Now your global configuration file is ready. You can check that at ~/.gitconfig
    13. 13. No. 13September 27, 2013 Collaborative development with Git Git Repository • Create a git repository – mkdir your-directory-name – git init • Add initial files to the git repository – git add file1 file2 • Commit changes – git commit – (it will ask you to enter a comment) • Log and status – git log – git status • Help – git help
    14. 14. No. 14September 27, 2013 Collaborative development with Git Structure of Git
    15. 15. No. 15September 27, 2013 Collaborative development with Git Head, Branches, Tags
    16. 16. No. 16September 27, 2013 Collaborative development with Git Branching, Merging and tagging • Create new branch and switch to it – git branch name-of-branch – git checkout name-of-branch • Merge branches – git merge name-of-branch-to-merge-with-current-branch – Merge conflicts should be resolved manually • Tagging – git tag tag-name – It will create a tag in the current git object pointed by the HEAD
    17. 17. No. 17September 27, 2013 Collaborative development with Git Working with remote repositaries • Add a remote repository – git remote add origin url-of-remote-repository • Push Pull – git pull – Pull the remote branch to the local branch – git push origin master – Push the change to the remote branch
    18. 18. No. 18September 27, 2013 Collaborative development with Git Patching • Branch – git checkout -b fix_the_bug • Create a patch – git format-patch master --stdout > fix_the_bug.patch • Applying the patch – git apply --stat fix_empty_poster.patch – git apply --check fix_empty_poster.patch
    19. 19. No. 19September 27, 2013 Collaborative development with Git Working with remote repositaries • Add a remote repository – git remote add origin url-of-remote-repository • Push Pull – git pull – Pull the remote branch to the local branch – git push origin master – Push the change to the remote branch
    20. 20. No. 20September 27, 2013 Collaborative development with Git On-line git hosting • http://gitorious.org/ • http://github.com • Gitolite
    21. 21. No. 21September 27, 2013 Collaborative development with Git Thanks... • http://git-scm.com/documentation • questions?? vimal.joseph@zyxware.com Zyxware Technologies

    ×