Version Control with Git

Reference

Glossary

change set: A group of changes to one or more files that are or will be added to a single commit in a version control repository.
commit: To record the current state of a set of files (a change set) in a version control repository. As a noun, the result of commiting, i.e. a recorded change set in a repository. If a commit contains changes to multiple files, all of the changes are recorded together.
conflict: A change made by one user of a version control system that is incompatible with changes made by other users. Helping users resolve conflicts is one of version control’s major tasks.
HTTP: The Hypertext Transfer Protocol used for sharing web pages and other data on the World Wide Web.
infective license: A license, such as the GPL, that legally requires people who incorporate material under the infective license into their own work to also release under the same infective license (eg. under the GPL license).
merge: (a repository): To reconcile two sets of changes to a repository.
protocol: A set of rules that define how one computer communicates with another. Common protocols on the Internet include HTTP and SSH.
remote: (of a repository) A version control repository connected to another, in such way that both can be kept in sync exchanging commits.
repository: A storage area where a version control system stores the full history of commits of a project and information about who changed what, when.
resolve: To eliminate the conflicts between two or more incompatible changes to a file or set of files being managed by a version control system.
revision: A recorded change set of a version control repository. The same as a commit.
SSH: The Secure Shell protocol used for secure communication between computers.
timestamp: A record of when a particular event occurred.
version control: A tool for managing changes to a set of files. Each set of changes creates a new commit of the files; the version control system allows users to recover old commits reliably, and helps manage conflicting changes made by different users.