Mercurial > evolve-talk

changeset 15:1c59bbe16b18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add restore command to slides (hg touch, renamed)
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Sun, 09 Mar 2014 11:38:34 -0400
parents e99a93596676
children 389af285236f
files talk.tex
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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}