Mercurial > hg > mercurial-talk
view histedit.tex @ 364:df4a5c5570e7 default tip
some personal tweaks
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Wed, 19 Dec 2012 15:35:01 -0500 (2012-12-19) |
parents | 896203970327 |
children |
line wrap: on
line source
\begin{frame}{Editing History} \tikzstyle{rev}+=[on chain, minimum size=6mm] \tikzstyle{squiggle}=[on chain, font=\large, red] \tikzset{node distance=5mm} Inspired by \cmd{git rebase -i}, \ext{histedit} lets you \begin{itemize}[<+->] \item reorder changesets: \begin{tikzpicture}[start chain] \node[rev] {$A$}; \node[rev,join] {$B$}; \node[rev,join] {$C$}; \node[squiggle] {$\rightsquigarrow$}; \node[rev] {$A$}; \node[rev,join] {$C'$}; \node[rev,join] {$B'$}; \end{tikzpicture} \item fold changesets: \begin{tikzpicture}[start chain] \node[rev] {$A$}; \node[rev,join] {$B$}; \node[rev,join] {$C$}; \node[squiggle] {$\rightsquigarrow$}; \node[rev] {$A$}; \node[rev,join] {$BC$}; \end{tikzpicture} \item drop changesets: \begin{tikzpicture}[start chain] \node[rev] {$A$}; \node[rev,join] {$B$}; \node[rev,join] {$C$}; \node[squiggle] {$\rightsquigarrow$}; \node[rev] {$A$}; \node[rev,join] {$C'$}; \end{tikzpicture} \item edit changesets: \begin{tikzpicture}[start chain] \node[rev] {$A$}; \node[rev,join] {$B$}; \node[rev,join] {$C$}; \node[squiggle] {$\rightsquigarrow$}; \node[rev] {$A$}; \node[rev,join] {$X$}; \node[rev,join] {$B'$}; \node[rev,join] {$C'$}; \end{tikzpicture} \end{itemize} \end{frame}