diff --git a/presentations/software-engineering-basics/software-engineering-basics.pdf b/presentations/software-engineering-basics/software-engineering-basics.pdf index 62559f5..f26a8eb 100644 Binary files a/presentations/software-engineering-basics/software-engineering-basics.pdf and b/presentations/software-engineering-basics/software-engineering-basics.pdf differ diff --git a/presentations/software-engineering-basics/software-engineering-basics.tex b/presentations/software-engineering-basics/software-engineering-basics.tex index 3e91321..085f80f 100644 --- a/presentations/software-engineering-basics/software-engineering-basics.tex +++ b/presentations/software-engineering-basics/software-engineering-basics.tex @@ -173,7 +173,7 @@ Namespaces are one honking great idea -- let's do more of those! \item TST: addition or modification of tests \end{itemize} - Source: \href{https://docs.scipy.org/doc/numpy-1.13.0/dev/gitwash/development_workflow.html}{Scipy Development Workflow} + Source: \href{https://docs.scipy.org/doc/numpy-1.13.0/dev/gitwash/development_workflow.html}{Scipy Docs} } \only<3>{ \begin{itemize} @@ -186,6 +186,16 @@ Namespaces are one honking great idea -- let's do more of those! \end{frame} +\begin{frame}{commit ammend} + \texttt{\$ git commit --amend} + + \begin{itemize} + \item Add to last commit / change message + \item Only on feature branch as it might require force-push! + \end{itemize} +\end{frame} + + \begin{frame}{commit squashing} \begin{columns} \begin{column}{0.5\textwidth}