Book Image

Git: Version Control for Everyone

By : Ravishankar Somasundaram
Book Image

Git: Version Control for Everyone

By: Ravishankar Somasundaram

Overview of this book

<div> <div>Git – is free software which enables you to maintain different versions of single or multiple files present inside a directory(folder), and allows you to switch back and forth between them at any given point of time. It also allows multiple people to work on the same file collaboratively or in parallel, without being connected to a server or any other centralized system continuously.<br /><br />This book is a step by step, practical guide, helping you learn the routine of version controlling all your content, every day. <br /><br />If you are an average computer user who wants to be able to maintain multiple versions of files and folders, or to go back and forth in time with respect to the files content – look no further. The workflow explained in this book will benefit anyone, no matter what kind of text or documentation they work on.<br /><br />This book will also benefit developers, administrators, analysts, architects and anyone else who wishes to perform simultaneous, collaborative work, or work in parallel on the same set of files. Git's advanced features are there to make your life easier.<br /><br /><br /><br /><br /><br /></div> </div>

Related Content you might be interested in

Current Title:

Small book image
Git: Version Control for Everyone
Ravishankar Somasundaram
Jan, 2013 | 180 pages
No titles found
Table of Contents (16 chapters)
Git: Version Control for Everyone Beginner's Guide
Git: Version Control for Everyone Beginner's Guide
Credits
Credits
About the Author
About the Author
Acknowledgement
Acknowledgement
About the Reviewers
About the Reviewers
www.PacktPub.com
www.PacktPub.com
Preface
Preface
Free Chapter
1
Breathe Easy – Introduction to Version Control System
Breathe Easy – Introduction to Version Control System
Do you need help
What is a version control system
Why you need a version control system
Types of version control systems
Falling for Git
Summary
2
Welcome Aboard – Installing Git
Welcome Aboard – Installing Git
Choosing your type – download your OS specific package
Time for action – installing Git on Windows
Time for action – installing Git on Mac
Time for action – installing Git on Linux
Summary
3
Polishing Your Routine – How to Increase Everyday Productivity
Polishing Your Routine – How to Increase Everyday Productivity
Suit up – getting ready for your Git
Initiation
Time for action – initiation in GUI mode
Time for action – initiation in CLI mode
Time for action – configure Git in GUI mode
Time for action – configure Git in CLI mode
Adding your files to your directory
Time for action – adding files to your directory (GUI and CLI mode)
Time for action – usage of .gitignore
Committing the added files
Time for action – committing files in GUI mode
Time for action – committing files in CLI mode
Time for action – rescan in GUI mode
Checking out
Time for action – checking out using GUI mode
Time for action – checking out using CLI mode
Resetting
Time for action – reset using GUI mode
Time for action – reset using CLI mode
Summary
4
Split the Load – Distributed Working with Git
Split the Load – Distributed Working with Git
Why share your files
Time for action – adding a remote origin using CLI mode
Time for action – resume your work from anywhere using CLI mode
Time for action – adding a remote origin using GUI mode
Time for action – resume your work from anywhere using GUI mode
Time for action – creating a bare repository in CLI mode
Time for action – creating a bare repository in GUI mode
Summary
5
Be a Puppet Master – Learn Fancy Features to Control Git's Functions
Be a Puppet Master – Learn Fancy Features to Control Git's Functions
Why learn such fancy features
Time for action – getting acquainted with shortlog
Time for action – parameterizing shortlog
Time for action – skip commit logs
Time for action – filter logs with date range
Time for action – searching for a word/character match
Time for action – emulate the mess
Time for action – clean up your mess with pattern match
Time for action – wipe out your mess completely, no exceptions
Time for action – lightweight/unannotated tagging
Time for action – referencing tags
Time for action – annotated tagging
Summary
6
Unleash the Beast – Git on Text-based Files
Unleash the Beast – Git on Text-based Files
Git for text-based files – an introduction
Multiplayer mode – multiple players at a time
Time for action – getting ready to share
Time for action – distributed work force
Time for action – Bob's changes
Time for action – Lisa's changes
Time for action – Lisa examines the merge conflict
Time for action – Lisa resolves the merge conflict
Time for action – team members get sync with the central bare repo
Summary
7
Parallel Dimensions – Branching with Git
Parallel Dimensions – Branching with Git
What is branching
Why do you need a branch
When do you need a branch
Practice makes perfect: branching with Git
Time for action – creating branches in GUI mode
Time for action – creating branches in CLI mode
.config file – play with shortcuts
Time for action – adding simple aliases using CLI
Time for action – chain commands with a single alias using CLI
Time for action – adding complex aliases using GUI
Summary
8
Behind the Scenes – Basis of Git Basics
Behind the Scenes – Basis of Git Basics
Two sides of Git: plumbing and porcelain
Git init
Git – a content tracking system
Git add
Git commit
Git status
Git clone
Git remote
Git branch
Git tag
Git fetch
Git merge
Git pull
Git push
Git checkout
Relation across relations – Git packfiles
Summary
Index
Index

Time for action – resume your work from anywhere using CLI mode

Now let's enter the second phase, where we would like to resume our work from a remote machine.

There are only three stages involved here.

  1. Clone the repository from the server.

    git clone https://[email protected]/raviepic3/online_workbench.git /path/where/you/would/like/the/clone_to_be

  2. Make your changes to the files needed.

  3. Add/stage the modifications made in files, commit, and push.

    git add *
git commit –m 'Your commit message'
git pull
git push

    Tip

    As an alternative to git pull, we can also use git fetch followed by git merge @{u}.

What just happened?

We just practiced a working solution for maximizing productivity by effectively handling situations as described in Scenario 1.

Git add * stages/adds all your changes, which is confirmed and recorded by the git commit command. Git pull is used to check whether there are unsynced updates in the server; if present, they are synced appropriately followed by git push, which updates...

Previous Section
End of Section 4
Next Section