summaryrefslogtreecommitdiff
path: root/Documentation/gitk.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/gitk.txt')
-rw-r--r--Documentation/gitk.txt16
1 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index f843f39bf2..5ef3687e39 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -21,8 +21,9 @@ git repository.
OPTIONS
-------
-To control which revisions to shown, the command takes options applicable to
-the linkgit:git-rev-list[1] command. This manual page describes only the most
+To control which revisions to show, the command takes options applicable to
+the 'git-rev-list' command (see linkgit:git-rev-list[1]).
+This manual page describes only the most
frequently used options.
-n <number>::
@@ -48,6 +49,13 @@ frequently used options.
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
@@ -57,7 +65,7 @@ frequently used options.
For a more complete list of ways to spell object names, see
"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
-<path>::
+<path>...::
Limit commits to the ones touching files in the given paths. Note, to
avoid ambiguity wrt. revision names use "--" to separate the paths
@@ -67,7 +75,7 @@ Examples
--------
gitk v2.6.12.. include/scsi drivers/scsi::
- Show as the changes since version 'v2.6.12' that changed any
+ Show the changes since version 'v2.6.12' that changed any
file in the include/scsi or drivers/scsi subdirectories
gitk --since="2 weeks ago" \-- gitk::