BTW: I wonder if I am looking at correct file. Github shows
me date 2010-11-04 and I still see a lot of MathML stuff
in the file.
This is Alexander's last commit
https://github.com/mbait/fricas/commit/bec51d296ffb9872713600067536d3be3103c9ae
and it indeed has a commit date 05-Nov-2010.
Judging from where he branched, I guess he used git even before I told
him around Christmas.
https://github.com/mbait/fricas/network
BTW2: IIUC texmacs.spad.pamphlet compared to MathML version
is changed so much that it is better to treat it as new file.
But for other files I would like to see just the diff as
a single patch, so that I can see all changes and only the
changes. How can I get such diff?
Use the above (network) URL. You can click on any of these bullets and
see the respective commit. Also at the first above URL you find a
"parent" link and thus can go back in time.
Easier, of course, is if you do everything locally.
There are two ways to get the patches to your computer.
Preferred way should be (1).
(1) You follow https://sites.google.com/site/hemmecke/fricas-svn to
create your own clone and then fetch the changes of Alexander to your
local git repo as described here
https://sites.google.com/site/hemmecke/fricas-svn#collaborating-with-other-people
Create an account whebisch on github and follow the steps at
https://sites.google.com/site/hemmecke/fricas-svn#how-to-work-with
at least until (including) step 3. The rest you can do later.
I assume now, you have done
git clone [email protected]:whebisch/fricas.git
Add Alexander's repository as a "remote" and fetch his branches.
cd fricas
git remote add alex git://github.com/mbait/fricas.git
git fetch alex
git checkout alex/texmacs-format
(2) Without creating a github account you directly get Alexander's
repository.
git clone git://github.com/mbait/fricas.git
cd fricas
git checkout texmacs-format
Now, the best way to look at the patches is with
gitk --all
And if you want patch files, try
git format-patch -k18
this will create the 18 commits that Alexander is proposing.
But actually it's easier (in case (1)) with
git rebase master
(Unfortunately, it is not totally trivial, since as I wrote some days
ago, it involves resolving a simple merge conflict.)
Hope that helps.
Ralf
--
You received this message because you are subscribed to the Google Groups "FriCAS -
computer algebra system" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/fricas-devel?hl=en.
