Mercurial > evolve-talk

changeset 31:f42eee738337

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add more pauses in the command list
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Tue, 11 Mar 2014 17:02:16 -0400
parents 3df93a421f8d
children e7d4f5528b5d
files talk.tex
diffstat 1 files changed, 21 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/talk.tex	Tue Mar 11 16:55:28 2014 -0400
+++ b/talk.tex	Tue Mar 11 17:02:16 2014 -0400
@@ -138,25 +138,38 @@
     \column{0.3 \textwidth}
     \begin{itemize}
       \item \texttt{amend}
+      \pause
       \item \texttt{fold}
+      \pause
       \item \texttt{previous}
+      \pause
       \item \texttt{next}
+      \pause
       \item \texttt{prune}
+      \pause
       \item \texttt{uncommit}
+      \pause
       \item \texttt{restore}
     \end{itemize}
     \pause
     \column{0.7 \textwidth}
     \begin{itemize}
       \item \texttt{hg commit -{}-amend}
+      \pause
       \item can be done with \texttt{hg histedit}
+      \pause
       \item \texttt{hg update -r 'parents()'}
+      \pause
       \item \texttt{hg update -r 'children()'}
+      \pause
       \item \texttt{hg strip}
+      \pause
       \item \texttt{hg strip -{}-keep}
+      \pause
       \item \texttt{hg unbundle strip-backup/...}
     \end{itemize}
   \end{columns}
+  \pause
   \begin{center}
     {\large These are very scriptable!}
   \end{center}
@@ -178,12 +191,19 @@
     \end{itemize}
     \column{0.7 \textwidth}
     \begin{itemize}
+      \pause
       \item \texttt{git commit -{}-amend}
+      \pause
       \item can be done with \texttt{git rebase -i}
+      \pause
       \item \texttt{git checkout HEAD\^}
+      \pause
       \item Nothing simple, must use log or reflog
+      \pause
       \item \texttt{git reset -{}-hard HEAD\^}
+      \pause
       \item \texttt{git reset -{}-soft HEAD\^}
+      \pause
       \item Nothing simple, must use reflog
     \end{itemize}
   \end{columns}
@@ -192,6 +212,7 @@
 \begin{frame}
   {\Large \textbf{Evolve's core}}
   There's also a shiny, new command that does magic:
+  \pause
   \begin{center}
     {\Large \texttt{hg evolve}}
   \end{center}