summaryrefslogtreecommitdiff
path: root/src/git-in-reverse.tex
diff options
context:
space:
mode:
authorkballou <kballou@devnulllabs.io>2016-02-25 14:47:40 -0700
committerkballou <kballou@devnulllabs.io>2016-02-25 14:47:40 -0700
commit51de4b35ab921a6056bb9137baa4f43d4060da70 (patch)
treeed9f3cca757b4f8cb76187626bcb341caf72d346 /src/git-in-reverse.tex
parentc04949bcab72836c70ce8fd9b1ccdfdc751f4744 (diff)
downloadgit-in-reverse-51de4b35ab921a6056bb9137baa4f43d4060da70.tar.gz
git-in-reverse-51de4b35ab921a6056bb9137baa4f43d4060da70.tar.xz
Add note from gitworkflows man page
Diffstat (limited to 'src/git-in-reverse.tex')
-rw-r--r--src/git-in-reverse.tex2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/git-in-reverse.tex b/src/git-in-reverse.tex
index 5bf33d1..ea26666 100644
--- a/src/git-in-reverse.tex
+++ b/src/git-in-reverse.tex
@@ -682,6 +682,8 @@ Example Usage:
\begin{itemize}
\item{Standard use of \texttt{git-pull} requires clean working directory}
\item{Will force a merge, if drift between remote and local}
+\item{From the Git documentation~\cite{website:gitworkflows7}, ``Do not use
+\texttt{git pull} unless you actually want to merge the remote branch.''}
\item{I personally prefer creating an alias for \texttt{git-remote}}
\end{itemize}
\lstinputlisting[