# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1394379514 14400 # Node ID 1c59bbe16b18f69c1ed2762b86683ffdc28558f8 # Parent e99a93596676564129d073da3d9308006718890a Add restore command to slides (hg touch, renamed) diff -r e99a93596676 -r 1c59bbe16b18 talk.tex --- a/talk.tex Sun Mar 09 11:33:42 2014 -0400 +++ b/talk.tex Sun Mar 09 11:38:34 2014 -0400 @@ -139,6 +139,7 @@ \item \texttt{next} \item \texttt{prune} \item \texttt{uncommit} + \item \texttt{restore} \end{itemize} \pause \column{0.7 \textwidth} @@ -149,6 +150,7 @@ \item \texttt{hg update -r 'children()'} \item \texttt{hg strip} \item \texttt{hg strip -{}-keep} + \item \texttt{hg unbundle strip-backup/...} \end{itemize} \end{columns} \begin{center} @@ -168,6 +170,7 @@ \item \texttt{next} \item \texttt{prune} \item \texttt{uncommit} + \item \texttt{restore} \end{itemize} \column{0.7 \textwidth} \begin{itemize} @@ -177,6 +180,7 @@ \item Nothing simple, must use log or reflog \item \texttt{git reset -{}-hard HEAD\^} \item \texttt{git reset -{}-soft HEAD\^} + \item Nothing simple, must use reflog \end{itemize} \end{columns} \end{frame}