add special "matching refs" refspec

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 23be0050b0023cbfecc5fa271b97a7d9855a73b0..50d12da89fca37b60a024aeb2ac6de9cb2daf001 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -3,7 +3,7 @@ gitk(1)
 
 NAME
 ----
-gitk - git repository browser
+gitk - The git repository browser
 
 SYNOPSIS
 --------
@@ -22,7 +22,7 @@ git repository.
 OPTIONS
 -------
 To control which revisions to shown, the command takes options applicable to
-the gitlink:git-rev-list[1] command. This manual page describes only the most
+the linkgit:git-rev-list[1] command. This manual page describes only the most
 frequently used options.
 
 -n <number>, --max-count=<number>::
@@ -37,18 +37,30 @@ frequently used options.
 
        Show commits older than a specific date.
 
+--all::
+
+       Show all branches.
+
+--merge::
+
+       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.
+
 <revs>::
 
        Limit the revisions to show. This can be either a single revision
        meaning show from the given revision and back, or it can be a range in
        the form "'<from>'..'<to>'" to show all revisions between '<from>' and
        back to '<to>'. Note, more advanced revision selection can be applied.
+       For a more complete list of ways to spell object names, see
+       "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
 <path>::
 
        Limit commits to the ones touching files in the given paths. Note, to
        avoid ambiguity wrt. revision names use "--" to separate the paths
-       from any preceeding options.
+       from any preceding options.
 
 Examples
 --------
@@ -63,6 +75,16 @@ gitk --since="2 weeks ago" \-- gitk::
        The "--" is necessary to avoid confusion with the *branch* named
        'gitk'
 
+gitk --max-count=100 --all \-- Makefile::
+
+       Show at most 100 changes made to the file 'Makefile'. Instead of only
+       looking for changes in the current branch look in all branches.
+
+Files
+-----
+Gitk creates the .gitk file in your $HOME directory to store preferences
+such as display options, font, and colors.
+
 See Also
 --------
 'qgit(1)'::
@@ -87,5 +109,4 @@ Documentation by Junio C Hamano, Jonas Fonseca, and the git-list
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[7] suite