When you create videos from now on, can you also save your bash history to a
txt file and make it available. I re-watch some of the videos to write down
commands.
On Wed, Jun 24, 2009 at 5:26 PM, Ondrej Certik <ond...@certik.cz> wrote:
>
> On Wed, Jun 24, 2009 at 4:09 PM, Ryan Krauss<ryanli...@gmail.com> wrote:
> > So, it sounds like you are saying that either should work, right?
>
> Yes, only the first way produces a linear history and the second way a
> branched history (this depends on the structure of your branches, it
> may also produce a linear history) -- in any case, merge never moves
> any patches around, only adds new patches that merge things.
>
> >
> > I may be the cause of my own problem. It seems that my inline branch
> also
> > includes the mainvar branch:
> >
> > ryan|04:59 PM|~/git_temp/sympy (temp_inline)$ git diff github/mainvar
> > github/inline
> > diff --git a/sympy/printing/latex.py b/sympy/printing/latex.py
> > index f7e6b09..5e20c8f 100644
> > --- a/sympy/printing/latex.py
> > +++ b/sympy/printing/latex.py
> > @@ -43,7 +43,9 @@ class LatexPrinter(Printer):
> > def doprint(self, expr):
> > diff --git a/sympy/printing/latex.py b/sympy/printing/latex.py
> > index f7e6b09..5e20c8f 100644
> > --- a/sympy/printing/latex.py
> > +++ b/sympy/printing/latex.py
> > @@ -43,7 +43,9 @@ class LatexPrinter(Printer):
> > def doprint(self, expr):
> > tex = Printer.doprint(self, expr)
> >
> > - if self._settings['inline']:
> > + if self._settings['inline'] is None:
> > + return "%s" % tex
> > + elif self._settings['inline']:
> > return r"$%s$" % tex
> > else:
> > return r"\begin{equation*}%s\end{equation*}" % tex
> > diff --git a/sympy/printing/tests/test_latex.py
> > b/sympy/printing/tests/test_late
> > index 0415fd1..b9eb43d 100644
> > --- a/sympy/printing/tests/test_latex.py
> > +++ b/sympy/printing/tests/test_latex.py
> > @@ -177,3 +177,9 @@ def test_mainvar():
> > assert latex(expr, profile_y) == '$y^{4} + 3 x y^{3} + y x^{2} +
> > x^{3}$'
> > profile_x['descending'] = True
> > assert latex(expr, profile_x) == '$x^{3} + y x^{2} + 3 x y^{3} +
> > y^{4}$'
> > +
> > +def test_inline():
> > + expr = x+y
> > + assert latex(expr) == '$x + y$'
> > + assert latex(expr, inline=None) == 'x + y'
> > + assert latex(expr, inline=False)== '\\begin{equation*}x +
> > y\\end{equation*}
> > (END)
> >
> > i.e. the only differences in the branches are additions to create the
> inline
> > functionality.
> >
> > So, is there an easy way to get a tree structure to print from the
> command
> > line, or gitk my only option? I guess I needed to co the master before I
> > created inline instead of it being a branch from mainvar.
>
> http://psung.blogspot.com/2009/01/command-line-substitute-for-gitk.html
>
> e.g.:
>
> git log --graph --abbrev-commit --pretty=oneline --decorate
>
> does pretty good job. Thanks for bringing this up, I'll create some
> video about this too, it's better than gitk, I prefer to work in a
> terminal. You can create a shortcut for it, see your .gitconfig.
>
> Ondrej
>
> >
>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"sympy-patches" group.
To post to this group, send email to sympy-patches@googlegroups.com
To unsubscribe from this group, send email to
sympy-patches+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/sympy-patches?hl=en
-~----------~----~----~----~------~----~------~--~---
