Commit 13d2fe41 authored by Martijn Vermaat's avatar Martijn Vermaat

Merge branch 'tips_fixes' into 'master'

Some typo and formatting fixes in tips lecture
parents a5e44ea7 8d9910cf
......@@ -86,7 +86,7 @@
\bigskip
\pause
Then, in you ``\bt{.bashrc}'' file, add ``\bt{\_\_git\_ps1}'' to the
Then, in your ``\bt{.bashrc}'' file, add ``\bt{\_\_git\_ps1}'' to the
``\bt{PS1}'' variable, and source your ``\bt{.bashrc}'' again.
\bigskip
\end{frame}
......@@ -101,7 +101,7 @@
\pause
You can view who committed the line change, the commit hash,
and the commit time using ``\bt{git blame}''
and the commit time using ``\bt{git blame}''.
\begin{lstlisting}[language=none, caption=git blame command]
$ git blame README
a4394d28 (bow 2014-06 ...) Second version.
......@@ -122,7 +122,7 @@
\bigskip
\pause
Official releases, for example, are better referred as v1.0
Official releases, for example, are better referred to as v1.0
than a76a0fx.
\bigskip
\pause
......@@ -213,7 +213,7 @@
\bigskip
\pause
This can be done via ``\bt{git diff -w}''
This can be done via ``\bt{git diff -w}''.
\begin{lstlisting}[language=none, caption=git diff without whitespace]
$ git diff -w
\end{lstlisting}
......@@ -262,7 +262,7 @@
You can also use the command to meld current staged changes to your last
committed change.
\begin{lstlisting}[language=none, caption=git blame command]
\begin{lstlisting}[language=none, caption=git commit --amend]
$ git status
Changes to be committed:
modified: README
......@@ -313,8 +313,10 @@
\begin{frame}[fragile]
\frametitle{Viewing}
In Linux, git uses the ``\bt{~/.gitconfig}'' file as its main
configuration file.
% http://tex.stackexchange.com/a/9372
In Linux, git uses the
``\bt{{\raise.17ex\hbox{$\scriptstyle\mathtt{\sim}$}}/.gitconfig}'' file as
its main configuration file.
\bigskip
\pause
......@@ -333,8 +335,9 @@
\begin{frame}[fragile]
\frametitle{Modifying}
To edit the file directly, open ``\bt{~/.gitconfig}'' in a text editor
and save your changes.
To edit the file directly, open
``\bt{{\raise.17ex\hbox{$\scriptstyle\mathtt{\sim}$}}/.gitconfig}'' in a
text editor and save your changes.
\begin{lstlisting}[language=none, caption=Modifying the config file]
$ vim ~/.gitconfig
\end{lstlisting}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment