Commit 8d9910cf authored by Martijn Vermaat's avatar Martijn Vermaat

Some typo and formatting fixes in tips lecture

parent 14a508d8
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
\bigskip \bigskip
\pause \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. ``\bt{PS1}'' variable, and source your ``\bt{.bashrc}'' again.
\bigskip \bigskip
\end{frame} \end{frame}
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
\pause \pause
You can view who committed the line change, the commit hash, 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] \begin{lstlisting}[language=none, caption=git blame command]
$ git blame README $ git blame README
a4394d28 (bow 2014-06 ...) Second version. a4394d28 (bow 2014-06 ...) Second version.
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
\bigskip \bigskip
\pause \pause
Official releases, for example, are better referred as v1.0 Official releases, for example, are better referred to as v1.0
than a76a0fx. than a76a0fx.
\bigskip \bigskip
\pause \pause
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
\bigskip \bigskip
\pause \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] \begin{lstlisting}[language=none, caption=git diff without whitespace]
$ git diff -w $ git diff -w
\end{lstlisting} \end{lstlisting}
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
You can also use the command to meld current staged changes to your last You can also use the command to meld current staged changes to your last
committed change. committed change.
\begin{lstlisting}[language=none, caption=git blame command] \begin{lstlisting}[language=none, caption=git commit --amend]
$ git status $ git status
Changes to be committed: Changes to be committed:
modified: README modified: README
...@@ -310,8 +310,10 @@ ...@@ -310,8 +310,10 @@
\begin{frame}[fragile] \begin{frame}[fragile]
\frametitle{Viewing} \frametitle{Viewing}
In Linux, git uses the ``\bt{~/.gitconfig}'' file as its main % http://tex.stackexchange.com/a/9372
configuration file. In Linux, git uses the
``\bt{{\raise.17ex\hbox{$\scriptstyle\mathtt{\sim}$}}/.gitconfig}'' file as
its main configuration file.
\bigskip \bigskip
\pause \pause
...@@ -330,8 +332,9 @@ ...@@ -330,8 +332,9 @@
\begin{frame}[fragile] \begin{frame}[fragile]
\frametitle{Modifying} \frametitle{Modifying}
To edit the file directly, open ``\bt{~/.gitconfig}'' in a text editor To edit the file directly, open
and save your changes. ``\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] \begin{lstlisting}[language=none, caption=Modifying the config file]
$ vim ~/.gitconfig $ vim ~/.gitconfig
\end{lstlisting} \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