Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add shout-out during GitMerge 2017 #126

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add shout-out during GitMerge 2017 #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down