this is for holding javascript data
Emily Davenport fixed typo in definition box
over 8 years ago
Commit id: da5542ea2ed31e2a1564e6523597dab65ed88b20
deletions | additions
diff --git a/box-1-definitions.tex b/box-1-definitions.tex
index 7ccda12..c9648b8 100644
--- a/box-1-definitions.tex
+++ b/box-1-definitions.tex
...
\item \textbf{Git}: \textit{(noun)} a version control system
\item \textbf{repository (repo)}: \textit{(noun)} folder containing all tracked files as well as the version control history
\item \textbf{commit}: \textit{(noun)} a snapshot of changes made to the staged file(s); \textit{(verb)} to save a snapshot of changes made to the staged file(s)
\item \textbf{stage}:
\texit{(noun)} \textit{(noun)} the staging area holds the files to be committed in the next commit; \textit{(verb)} to mark a file to be committed in the next commit
\item \textbf{track}: \textit{(noun)} a tracked file is one that is recognized by the Git repository
\item \textbf{branch}: \textit{(noun)} a parallel version of the files in a repository (Box 2)
\item \textbf{local}: \textit{(noun)} the version of your repository that is stored on your personal computer
...
\item \textbf{pull request}: \textit{(noun)} a message sent by one user to merge the commits in their remote repository into another user's remote repository
\end{itemize}