Merge git://repo.or.cz/git-gui into maint

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 23be0050b0023cbfecc5fa271b97a7d9855a73b0..48c5894736ac3065e80a36e1a5230d86004bee2e 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
 --------
@@ -37,18 +37,24 @@ frequently used options.
 
        Show commits older than a specific date.
 
+--all::
+
+       Show all branches.
+
 <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 gitlink: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 +69,11 @@ 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.
+
 See Also
 --------
 'qgit(1)'::