Mercurial > evolve-talk
comparison talk.tex @ 32:e7d4f5528b5d
Add a reorder command as if it already existed (explain it doesn't yet)
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Tue, 11 Mar 2014 17:02:45 -0400 |
| parents | f42eee738337 |
| children | 7fb4764757b1 |
comparison
equal
deleted
inserted
replaced
| 31:f42eee738337 | 32:e7d4f5528b5d |
|---|---|
| 139 \begin{itemize} | 139 \begin{itemize} |
| 140 \item \texttt{amend} | 140 \item \texttt{amend} |
| 141 \pause | 141 \pause |
| 142 \item \texttt{fold} | 142 \item \texttt{fold} |
| 143 \pause | 143 \pause |
| 144 \item \texttt{reorder} | |
| 145 \pause | |
| 144 \item \texttt{previous} | 146 \item \texttt{previous} |
| 145 \pause | 147 \pause |
| 146 \item \texttt{next} | 148 \item \texttt{next} |
| 147 \pause | 149 \pause |
| 148 \item \texttt{prune} | 150 \item \texttt{prune} |
| 153 \end{itemize} | 155 \end{itemize} |
| 154 \pause | 156 \pause |
| 155 \column{0.7 \textwidth} | 157 \column{0.7 \textwidth} |
| 156 \begin{itemize} | 158 \begin{itemize} |
| 157 \item \texttt{hg commit -{}-amend} | 159 \item \texttt{hg commit -{}-amend} |
| 160 \pause | |
| 161 \item can be done with \texttt{hg histedit} | |
| 158 \pause | 162 \pause |
| 159 \item can be done with \texttt{hg histedit} | 163 \item can be done with \texttt{hg histedit} |
| 160 \pause | 164 \pause |
| 161 \item \texttt{hg update -r 'parents()'} | 165 \item \texttt{hg update -r 'parents()'} |
| 162 \pause | 166 \pause |
| 181 \begin{columns} | 185 \begin{columns} |
| 182 \column{0.3 \textwidth} | 186 \column{0.3 \textwidth} |
| 183 \begin{itemize} | 187 \begin{itemize} |
| 184 \item \texttt{amend} | 188 \item \texttt{amend} |
| 185 \item \texttt{fold} | 189 \item \texttt{fold} |
| 190 \item \texttt{reorder} | |
| 186 \item \texttt{previous} | 191 \item \texttt{previous} |
| 187 \item \texttt{next} | 192 \item \texttt{next} |
| 188 \item \texttt{prune} | 193 \item \texttt{prune} |
| 189 \item \texttt{uncommit} | 194 \item \texttt{uncommit} |
| 190 \item \texttt{restore} | 195 \item \texttt{restore} |
| 194 \pause | 199 \pause |
| 195 \item \texttt{git commit -{}-amend} | 200 \item \texttt{git commit -{}-amend} |
| 196 \pause | 201 \pause |
| 197 \item can be done with \texttt{git rebase -i} | 202 \item can be done with \texttt{git rebase -i} |
| 198 \pause | 203 \pause |
| 204 \item can be done with \texttt{git rebase -i} | |
| 205 \pause | |
| 199 \item \texttt{git checkout HEAD\^} | 206 \item \texttt{git checkout HEAD\^} |
| 200 \pause | 207 \pause |
| 201 \item Nothing simple, must use log or reflog | 208 \item Nothing simple, must use log or reflog |
| 202 \pause | 209 \pause |
| 203 \item \texttt{git reset -{}-hard HEAD\^} | 210 \item \texttt{git reset -{}-hard HEAD\^} |