John Blischak Update definitions in Box 1.  about 9 years ago

Commit id: ff8a9c4f24f6cbceb45d39230118ea5343f128aa

deletions | additions      

       

\subsection{Box 1: Definitions}  \begin{itemize}  \item \textbf{git}: \textbf{Git}:  \textit{(noun)} a version control system; \textit{(verb)} command used to run all version control processes system  \item \textbf{repository (repo)}: \textit{(noun)} folder containing all items to be version controlled tracked files  as well as the version control history \item \textbf{commit}: \textit{(noun)} a snapshot of changes made to a the  staged file or files; file(s);  \textit{(verb)} to save a snapshot of changes made to the  staged files file(s)  \item \textbf{branch}: \textit{(noun)} a parallel version of your the files in a  repository which separately version controlled (Box 2)  \item \textbf{local}: \textit{(noun)} the version of your repository that is stored on your personal computer  \item \textbf{remote}: \textit{(noun)} the version of your repository that is stored on the internet, for instance on github.com GitHub  \item \textbf{clone}:\textit{(noun)} a copy of a remote repository, made on your personal computer;  \textit{(verb)} to create a local  copy of a remote repository on your personal computer \item \textbf{fork}: \textit{(noun)} a copy of someone else's remote repository into your account; a repository;  \textit{(verb)} to copy someone else's remote a  repositoryinto your account  \item \textbf{merge}: \textit{(verb)} to combine different versions of update  files from two branches into one branch by incorporating the changes introduced in new commits  \item \textbf{pull}: \textit{(verb)} to incorporate the retrieve  commits made to from  a remote repository that are not in and merge them into  a local repositoryautomatically  \item \textbf{push}: \textit{(verb)} to send commits from a local repository to a remote repository  \item \textbf{pull request}: \textit{(noun)} a message sent by one user to merge the commits in  their remote repository into another users user's  remote repository \end{itemize}