Skip to content

Commit

Permalink
Added chap4 file
Browse files Browse the repository at this point in the history
Updated some terminology
  • Loading branch information
cbx33 committed Mar 2, 2011
1 parent 5f8cb97 commit 6de91d1
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 0 deletions.
2 changes: 2 additions & 0 deletions chap2.tex
Expand Up @@ -380,3 +380,5 @@ \subsection{Commands}
\texttt{git status} - Show the status of tracked, changed, untracked files
\subsection{Terminology}
\textbf{Branch} - A way of working on the same set of code in parallel without modifications overlapping

\textbf{Commit} - A group of objects and a tree in a Git repository
8 changes: 8 additions & 0 deletions chap3.tex
Expand Up @@ -247,9 +247,17 @@ \subsection{Commands}

\texttt{git log -S<string> <path>} - Show all commits that either introduced or removed a particular string from the repository, but restrict the search to a specific path

\texttt{git log HEAD~1..HEAD} - Show all commits between HEAD~1 and HEAD, essentially the last commit

\texttt{git diff HEAD~1..HEAD} - Show the actual differences between HEAD~1 and HEAD

\subsection{Terminology}
\textbf{Branch} - A way of working on the same set of code in parallel without modifications overlapping

\textbf{Diff} - Shows the actual differences between files

\textbf{Hunk} - A section of a diff output

%git log -p
%DIFFs
%Patching
Expand Down
8 changes: 8 additions & 0 deletions chap4.tex
@@ -0,0 +1,8 @@
% chap4.tex - Week 4
\cleardoublepage
%\phantomsection
\chapter{Week 4}
\section{Day 1 - ``Finally we're getting somehere''}
\subsection{Planting trees}
%branches
%merge
1 change: 1 addition & 0 deletions gitt.tex
Expand Up @@ -75,6 +75,7 @@
\input{chap1}
\input{chap2}
\input{chap3}
\input{chap4}
\input{ack}

\end{document}

0 comments on commit 6de91d1

Please sign in to comment.