diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/git-branch.tex | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/tex/git-branch.tex b/tex/git-branch.tex index ad5b2c9..79b7e24 100644 --- a/tex/git-branch.tex +++ b/tex/git-branch.tex @@ -18,6 +18,7 @@ \begin{tikzpicture} \draw [white] (0,0) -- (0,7.4); + \draw [white] (-1cm,0) -- (5,0); %% Template branch. \ifdefined\tofuture @@ -26,7 +27,9 @@ \ifdefined\tempevolve \draw[->, line width=2mm] (0,0) -- (0,5.5); \else - \draw[->, line width=2mm] (0,0) -- (0,2.3); + \ifdefined\abstractify + \draw[->, line width=2mm] (0,0) -- (0,2.3); + \fi \fi \fi @@ -57,12 +60,22 @@ %% otherwise the black lines are going to be over the commit %% circles. - %% Template commits. - \draw[anchor=north] (0,0) node {\textbf{Maneage}}; - \draw [fill=green!80!blue, opacity=0.5] (0,0.55cm) circle [radius=2.1mm]; - \draw[anchor=east] (-5pt,0.55cm) node {\tiny\texttt{ad2c476}}; - \draw [fill=green!80!blue, opacity=0.5] (0,1.55cm) circle [radius=2.1mm]; - \draw[anchor=east] (-5pt,1.55cm) node {\tiny\texttt{706c644}}; + %% Maneage commits. + \ifdefined\abstractify + \draw[anchor=north] (0,0) node {\textbf{Maneage}}; + \draw [fill=green!80!blue, opacity=0.5] (0,0.55cm) circle [radius=2.1mm]; + \draw[anchor=east] (-5pt,0.55cm) node {\tiny\texttt{ad2c476}}; + \draw [fill=green!80!blue, opacity=0.5] (0,1.55cm) circle [radius=2.1mm]; + \draw[anchor=east] (-5pt,1.55cm) node {\tiny\texttt{706c644}}; + \else + \node [inner sep=0pt] at (0,0.55cm) {\includegraphics[width=1.5cm]{img/project-flow-small.png}}; + \draw[anchor=center] (0,0.55cm) node {\bf Today}; + \ifdefined\tomorrow + \node [inner sep=0pt] at (0,1.55cm) {\includegraphics[width=1.5cm]{img/project-flow-small.png}}; + \draw[anchor=center] (0,1.55cm) node {\bf Tomorrow}; + \else + \fi + \fi \ifdefined\tempevolve \draw [fill=green!80!blue, opacity=0.5] (0,2.55cm) circle [radius=2.1mm]; \draw[anchor=east] (-5pt,2.55cm) node {\tiny\texttt{fa2ac10}}; @@ -119,7 +132,11 @@ \vspace{-1cm} \begin{itemize} \setlength\itemsep{0.2cm} - \item Template's history is recorded in Git. + \ifdefined\abstractify + \item Each point of project's history is recorded with Git. + \else + \item The project (answers to questions above) will evolve. + \fi \ifdefined\projinit \item New project: a branch from the template.\\ Recall that \alert{every commit} contains the following: |