Mercurial > evolve-talk
comparison talk.tex @ 15:1c59bbe16b18
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 |
comparison
equal
deleted
inserted
replaced
| 14:e99a93596676 | 15:1c59bbe16b18 |
|---|---|
| 137 \item \texttt{fold} | 137 \item \texttt{fold} |
| 138 \item \texttt{previous} | 138 \item \texttt{previous} |
| 139 \item \texttt{next} | 139 \item \texttt{next} |
| 140 \item \texttt{prune} | 140 \item \texttt{prune} |
| 141 \item \texttt{uncommit} | 141 \item \texttt{uncommit} |
| 142 \item \texttt{restore} | |
| 142 \end{itemize} | 143 \end{itemize} |
| 143 \pause | 144 \pause |
| 144 \column{0.7 \textwidth} | 145 \column{0.7 \textwidth} |
| 145 \begin{itemize} | 146 \begin{itemize} |
| 146 \item \texttt{hg commit -{}-amend} | 147 \item \texttt{hg commit -{}-amend} |
| 147 \item can be done with \texttt{hg histedit} | 148 \item can be done with \texttt{hg histedit} |
| 148 \item \texttt{hg update -r 'parents()'} | 149 \item \texttt{hg update -r 'parents()'} |
| 149 \item \texttt{hg update -r 'children()'} | 150 \item \texttt{hg update -r 'children()'} |
| 150 \item \texttt{hg strip} | 151 \item \texttt{hg strip} |
| 151 \item \texttt{hg strip -{}-keep} | 152 \item \texttt{hg strip -{}-keep} |
| 153 \item \texttt{hg unbundle strip-backup/...} | |
| 152 \end{itemize} | 154 \end{itemize} |
| 153 \end{columns} | 155 \end{columns} |
| 154 \begin{center} | 156 \begin{center} |
| 155 {\large These are very scriptable!} | 157 {\large These are very scriptable!} |
| 156 \end{center} | 158 \end{center} |
| 166 \item \texttt{fold} | 168 \item \texttt{fold} |
| 167 \item \texttt{previous} | 169 \item \texttt{previous} |
| 168 \item \texttt{next} | 170 \item \texttt{next} |
| 169 \item \texttt{prune} | 171 \item \texttt{prune} |
| 170 \item \texttt{uncommit} | 172 \item \texttt{uncommit} |
| 173 \item \texttt{restore} | |
| 171 \end{itemize} | 174 \end{itemize} |
| 172 \column{0.7 \textwidth} | 175 \column{0.7 \textwidth} |
| 173 \begin{itemize} | 176 \begin{itemize} |
| 174 \item \texttt{git commit -{}-amend} | 177 \item \texttt{git commit -{}-amend} |
| 175 \item can be done with \texttt{git rebase -i} | 178 \item can be done with \texttt{git rebase -i} |
| 176 \item \texttt{git checkout HEAD\^} | 179 \item \texttt{git checkout HEAD\^} |
| 177 \item Nothing simple, must use log or reflog | 180 \item Nothing simple, must use log or reflog |
| 178 \item \texttt{git reset -{}-hard HEAD\^} | 181 \item \texttt{git reset -{}-hard HEAD\^} |
| 179 \item \texttt{git reset -{}-soft HEAD\^} | 182 \item \texttt{git reset -{}-soft HEAD\^} |
| 183 \item Nothing simple, must use reflog | |
| 180 \end{itemize} | 184 \end{itemize} |
| 181 \end{columns} | 185 \end{columns} |
| 182 \end{frame} | 186 \end{frame} |
| 183 | 187 |
| 184 \begin{frame} | 188 \begin{frame} |