GIT 1.6.2-rc2

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 5ef3687e3941adaeb652b161d7488aaed942d9d3..bd005bc5c8c7d877ea9de79e2f6452d5703d0892 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -47,7 +47,8 @@ frequently used options.
 
        After an attempt to merge stops with conflicts, show the commits on
        the history between two branches (i.e. the HEAD and the MERGE_HEAD)
-       that modify the conflicted files.
+       that modify the conflicted files and do not exist on all the heads
+       being merged.
 
 --argscmd=<command>::
        Command to be run each time gitk has to determine the list of
@@ -56,6 +57,11 @@ frequently used options.
        Use this instead of explicitly specifying <revs> if the set of
        commits to show may vary between refreshes.
 
+--select-commit=<ref>::
+
+       Automatically select the specified commit after loading the graph.
+       Default behavior is equivalent to specifying '--select-commit=HEAD'.
+
 <revs>::
 
        Limit the revisions to show. This can be either a single revision