mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-09-21 04:28:11 +03:00
Code Issues Projects Releases Wiki Activity
b28372ad73
git-imerge/doc/presentations/GitMerge-2013
History
Michael Haggerty 3bc89fb280 Fix the diagram for rebase-with-history. 
The "branch" reference should be moved, not the "master" reference.

Reported-by: Christoffer Hammarström
2013-07-15 10:42:52 +02: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
README.txt Add the talk that I presented at GitMerge 2013. 2013-05-11 18:01:12 +02: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 the top-level directory.

-- Michael Haggerty