@ -1,6 +1,5 @@
\documentclass{beamer}
\documentclass{beamer}
\usepackage{pgfpages}
\usepackage{pgfpages}
%showNotes%\setbeameroption{show notes on second screen=right}
%showNotes%\setbeameroption{show notes on second screen=right}
%\setbeamertemplate{note page}{\pagecolor{yellow!5}\insertnote}
%\setbeamertemplate{note page}{\pagecolor{yellow!5}\insertnote}
@ -1038,22 +1037,13 @@ can really help.
}
}
\end{frame}
\end{frame}
\begin{frame}
\frametitle{Git $\ne$ GitHub}
\begin{itemize}
\item GitHub is one of many services that offer hosting for git remotes
\item It is owned by Microsoft now
\item It is not open source
\item You can't self host it
\item It it very popular
\end{itemize}
\note{%
}
\end{frame}
\begin{frame}
\begin{frame}
\frametitle{Useful supporting tools}
\frametitle{Useful supporting tools}
\framesubtitle{Bat}
\framesubtitle{Bat}
\begin{center}
\includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{auto-download-aHR0cHM6Ly9jYW1vLmdpdGh1YnVzZXJjb250ZW50LmNvbS82N2U0NGY0YTY4MTUwMzI1Zjc0YjNhNDY4MjBiNzQ3M2ZmN2I5MWE2LzY4NzQ3NDcwNzMzYTJmMmY2OTJlNjk2ZDY3NzU3MjJlNjM2ZjZkMmYzMjZjNTM1NzM0NTI0NTJlNzA2ZTY3.png}
\end{center}
\href{https://github.com/sharkdp/bat}{https://github.com/sharkdp/bat}
\note{%
\note{%
Bat is described as cat with wings.
Bat is described as cat with wings.
@ -1066,6 +1056,9 @@ can really help.
\begin{frame}
\begin{frame}
\frametitle{Useful supporting tools}
\frametitle{Useful supporting tools}
\framesubtitle{RigGrep / Fd}
\framesubtitle{RigGrep / Fd}
\href{https://github.com/sharkdp/fd}{https://github.com/sharkdp/fd}
\href{https://github.com/BurntSushi/ripgrep}{https://github.com/BurntSushi/ripgrep}
\note{%
\note{%
Alternatives to grep and find
Alternatives to grep and find
@ -1078,6 +1071,10 @@ can really help.
\begin{frame}
\begin{frame}
\frametitle{Useful supporting tools}
\frametitle{Useful supporting tools}
\framesubtitle{Delta}
\framesubtitle{Delta}
\begin{center}
\includegraphics[width=\textwidth,height=0.6\textheight,keepaspectratio]{auto-download-aHR0cHM6Ly91c2VyLWltYWdlcy5naXRodWJ1c2VyY29udGVudC5jb20vNTIyMDUvNjUyNDg1MjUtMzIyNTA0ODAtZGFlYS0xMWU5LTk5NjUtMWEwNWM2YTRiZGY0LnBuZw==.png}
\end{center}
\href{https://github.com/dandavison/delta}{https://github.com/dandavison/delta}
\note{%
\note{%
This is a tool that can make your diff output look better.
This is a tool that can make your diff output look better.
}
}
@ -1085,42 +1082,68 @@ can really help.
\begin{frame}
\begin{frame}
\frametitle{Useful supporting tools}
\frametitle{Useful supporting tools}
\framesubtitle{Shell Integration}
\framesubtitle{BFG Repo Cleaner}
You'll need something like this when you realise you have just committed your ssh keys
\href{https://rtyley.github.io/bfg-repo-cleaner/}{https://rtyley.github.io/bfg-repo-cleaner/}
\note{%
\note{%
Takes 2 forms. Prompt and completion
For the time that you accidentally commit your ssh keys.
I accidentally committed a database for an Woocommerce site.
}
}
\end{frame}
\end{frame}
\begin{frame}
\begin{frame}
\frametitle{Useful supporting tools}
\frametitle{Useful supporting tools}
\framesubtitle{Pass}
\framesubtitle{Shell Integration}
Git ships with completion for bash, zsh and tcsh. You may need to source it in the relevant rc
file.
Prompt customisation is available out of the box for bash and zsh.
\note{%
\note{%
Password manager
If you haven't ever tried zsh, give it a shot. Tab completion is so much more useful than
Bash's.
}
}
\end{frame}
\end{frame}
\begin{frame}
\begin{frame}
\frametitle{Useful supporting tools}
\frametitle{Useful supporting tools}
\framesubtitle{BFG Repo Cleaner}
\framesubtitle{Pass}
\begin{itemize}
\begin{itemize}
\item You'll need something like this when you realise you have just committed your ssh keys
\item Password Manager
\item Mistakes happen
\item Uses Git for keeping track of history
\item Syncs using Git
\item Everything is encrypted with a GPG key
\item Has compatible android, ios and browser apps.
\end{itemize}
\end{itemize}
\note{%
For the time that you accidentally commit your ssh keys.
I accidentally committed a database for an Woocommerce site.
\href{https://www.passwordstore.org/}{https://www.passwordstore.org/}
\note{%
A password manager that uses Git for sync and history.
}
}
\end{frame}
\end{frame}
\begin{frame}
\begin{frame}
\frametitle{Useful supporting tools}
\frametitle{Useful supporting tools}
\framesubtitle{tldr}
\framesubtitle{tldr}
Git's built in help is very thorough - sometimes you don't want that though.
The man page for git pull is over 700 lines.
\begin{center}
\includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{auto-shell-tldr.pdf}
\end{center}
\href{https://github.com/tldr-pages/tldr}{https://github.com/tldr-pages/tldr}
\note{%
\note{%
For the time that you accidentally commit your ssh keys.
Sometimes incredibly thorough documentation isn't what you want. Sometimes you know the
command you need but you can't remember exactly how to use it.
This is not specific to git commands, it covers a LOT.
I accidentally committed a database for an Woocommerce site.
}
}
\end{frame}
\end{frame}