mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-09-11 15:16:16 +03:00
Code Issues Projects Releases Wiki Activity
5c1b6f1552
git-imerge/doc/presentations/GitMerge-2013
History
Paul Wise 5c1b6f1552
Move Makefile to the talk directory 
It is no longer needed outside this directory
since it has mostly been replaced by setup.py.

Always build the talk HTML, now that the Makefile is in a subdir,
since subdir builds only happen when explicitly requested.

Update the documentation to match the new build setup.
2020-10-26 06:59:42 +08:00
..
ui/small-white Add the talk that I presented at GitMerge 2013. 2013-05-11 18:01:12 +02:00
.gitignore Add the talk that I presented at GitMerge 2013. 2013-05-11 18:01:12 +02:00
Makefile Move Makefile to the talk directory 2020-10-26 06:59:42 +08:00
README.txt Move Makefile to the talk directory 2020-10-26 06:59:42 +08:00
talk.rst Fix the diagram for rebase-with-history. 2013-07-15 10:42:52 +02:00

README.txt 

I gave this talk on 2013-May-10 at the GitMerge conference in Berlin
on "User Day".

(I gave another, more technical talk on a whiteboard the day before at
"Developer Day".)

To convert it into HTML, run "make html" in this directory.

-- Michael Haggerty