</li>\r
<li>\r
<p>\r
-<em>%ad</em>: author date\r
+<em>%ad</em>: author date (format respects --date= option)\r
</p>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-21 10:34:00 UTC\r
+Last updated 2008-08-29 08:56:28 UTC\r
</div>\r
</div>\r
</body>\r
</li>\r
<li>\r
<p>\r
-<em>%ad</em>: author date\r
+<em>%ad</em>: author date (format respects --date= option)\r
</p>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-20 09:13:33 UTC\r
+Last updated 2008-08-29 08:56:28 UTC\r
</div>\r
</div>\r
</body>\r
</li>\r
<li>\r
<p>\r
-<em>%ad</em>: author date\r
+<em>%ad</em>: author date (format respects --date= option)\r
</p>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-13 20:03:49 UTC\r
+Last updated 2008-08-29 08:56:30 UTC\r
</div>\r
</div>\r
</body>\r
</li>\r
<li>\r
<p>\r
-<em>%ad</em>: author date\r
+<em>%ad</em>: author date (format respects --date= option)\r
</p>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-31 22:10:23 UTC\r
+Last updated 2008-08-29 08:56:30 UTC\r
</div>\r
</div>\r
</body>\r
</li>\r
<li>\r
<p>\r
-<em>%ad</em>: author date\r
+<em>%ad</em>: author date (format respects --date= option)\r
</p>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:18 UTC\r
+Last updated 2008-08-29 08:56:31 UTC\r
</div>\r
</div>\r
</body>\r
</p>\r
</dd>\r
<dt>\r
+--argscmd=<command>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Command to be run each time gitk has to determine the list of\r
+ <revs> to show. The command is expected to print on its standard\r
+ output a list of additional revs to be shown, one per line.\r
+ Use this instead of explicitly specifying <revs> if the set of\r
+ commits to show may vary between refreshes.\r
+</p>\r
+</dd>\r
+<dt>\r
<revs>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-31 22:10:25 UTC\r
+Last updated 2008-08-29 08:56:32 UTC\r
</div>\r
</div>\r
</body>\r
the history between two branches (i.e. the HEAD and the MERGE_HEAD)
that modify the conflicted files.
+--argscmd=<command>::
+ Command to be run each time gitk has to determine the list of
+ <revs> to show. The command is expected to print on its standard
+ output a list of additional revs to be shown, one per line.
+ Use this instead of explicitly specifying <revs> if the set of
+ commits to show may vary between refreshes.
+
<revs>::
Limit the revisions to show. This can be either a single revision
<div class="listingblock">\r
<div class="content">\r
<pre><tt>alice$ git fetch /home/bob/myrepo master\r
-alice$ git log -p ..FETCH_HEAD</tt></pre>\r
+alice$ git log -p HEAD..FETCH_HEAD</tt></pre>\r
</div></div>\r
-<div class="para"><p>This operation is safe even if Alice has uncommitted local changes.</p></div>\r
+<div class="para"><p>This operation is safe even if Alice has uncommitted local changes.\r
+The range notation HEAD..FETCH_HEAD" means "show everything that is reachable\r
+from the FETCH_HEAD but exclude anything that is reachable from HEAD.\r
+Alice already knows everything that leads to her current state (HEAD),\r
+and reviewing what Bob has in his state (FETCH_HEAD) that she has not\r
+seen with this command</p></div>\r
+<div class="para"><p>If Alice wants to visualize what Bob did since their histories forked\r
+she can issue the following command:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ gitk HEAD..FETCH_HEAD</tt></pre>\r
+</div></div>\r
+<div class="para"><p>This uses the same two-dot range notation we saw earlier with <em>git log</em>.</p></div>\r
+<div class="para"><p>Alice may want to view what both of them did since they forked.\r
+She can use three-dot form instead of the two-dot form:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ gitk HEAD...FETCH_HEAD</tt></pre>\r
+</div></div>\r
+<div class="para"><p>This means "show everything that is reachable from either one, but\r
+exclude anything that is reachable from both of them".</p></div>\r
+<div class="para"><p>Please note that these range notation can be used with both gitk\r
+and "git log".</p></div>\r
<div class="para"><p>After inspecting what Bob did, if there is nothing urgent, Alice may\r
decide to continue working without pulling from Bob. If Bob's history\r
does have something Alice would immediately need, Alice may choose to\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-15 15:48:35 UTC\r
+Last updated 2008-08-29 08:56:32 UTC\r
</div>\r
</div>\r
</body>\r
------------------------------------------------
alice$ git fetch /home/bob/myrepo master
-alice$ git log -p ..FETCH_HEAD
+alice$ git log -p HEAD..FETCH_HEAD
------------------------------------------------
This operation is safe even if Alice has uncommitted local changes.
+The range notation HEAD..FETCH_HEAD" means "show everything that is reachable
+from the FETCH_HEAD but exclude anything that is reachable from HEAD.
+Alice already knows everything that leads to her current state (HEAD),
+and reviewing what Bob has in his state (FETCH_HEAD) that she has not
+seen with this command
+
+If Alice wants to visualize what Bob did since their histories forked
+she can issue the following command:
+
+------------------------------------------------
+$ gitk HEAD..FETCH_HEAD
+------------------------------------------------
+
+This uses the same two-dot range notation we saw earlier with 'git log'.
+
+Alice may want to view what both of them did since they forked.
+She can use three-dot form instead of the two-dot form:
+
+------------------------------------------------
+$ gitk HEAD...FETCH_HEAD
+------------------------------------------------
+
+This means "show everything that is reachable from either one, but
+exclude anything that is reachable from both of them".
+
+Please note that these range notation can be used with both gitk
+and "git log".
After inspecting what Bob did, if there is nothing urgent, Alice may
decide to continue working without pulling from Bob. If Bob's history
- '%an': author name
- '%aN': author name (respecting .mailmap)
- '%ae': author email
-- '%ad': author date
+- '%ad': author date (format respects --date= option)
- '%aD': author date, RFC2822 style
- '%ar': author date, relative
- '%at': author date, UNIX timestamp