Merge branch 'maint-1.6.0' into maint

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 5ef3687e3941adaeb652b161d7488aaed942d9d3..4673a75a98da1f778c1323d8e5a4f7faff388589 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -56,6 +56,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