From 8d2341ebe1792aa2795a020fd2b6489b12446170 Mon Sep 17 00:00:00 2001 From: Wilson Mar Date: Mon, 29 May 2017 17:34:24 -0400 Subject: [PATCH] Add shout-out during GitMerge 2017 --- README.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rst b/README.rst index cc3aa71..b2d2de2 100644 --- a/README.rst +++ b/README.rst @@ -29,6 +29,9 @@ Ferris Nicolaisen for his `GitMinutes Podcast #12`_. .. _`GitMinutes Podcast #12`: http://episodes.gitminutes.com/2013/06/gitminutes-12-git-merge-2013-part-4.html +.. _`Shout-out by Patrick McKenna at GitMerge May 2017`: + https://www.youtube.com/watch?v=2UKd0YMuc-M&t=32m3s + To learn how to use the ``git-imerge`` tool itself, I suggest the blog article `git-imerge: A Practical Introduction`_ and also typing ``git-imerge --help`` and ``git-imerge SUBCOMMAND --help``. If you