diff --git a/merging/merging.tex b/merging/merging.tex index b10a695a043c8c3a37de1e7957b4f62dfdb8a0b7..8e8a36cd99660b28af816f5bbc6bb8e4e4e2e97f 100644 --- a/merging/merging.tex +++ b/merging/merging.tex @@ -166,6 +166,25 @@ $ git log --oneline --decorate --graph --all \bt{--all}: Includes all branches instead of just the current. \end{frame} +\begin{frame}[fragile] + \frametitle{Annotated log as an alias} + For convenience, we can create an alias for the \bt{git log} command with + all the arguments we just used: + \begin{lstlisting} +$ git config --global alias.l \ + 'log --oneline --decorate --graph --all' +$ git l +* 8fc25c1 (interface) Trivial Python interface +| * c7f3bd9 (HEAD, master) Add .gitignore file +|/ +* 4a44c4e Merge branch 'license' +... +\end{lstlisting} + \bigskip + This alias is stored in the \bt{~/.gitconfig} file. You can also edit that + file manually. +\end{frame} + \begin{frame} \frametitle{Remote branches} In this course, we don't really discuss branches, except: